From 722a408c418730c8ccd45ade438758391e657c64 Mon Sep 17 00:00:00 2001
From: Delete69 <95458399+Delete69@users.noreply.github.com>
Date: Tue, 5 Apr 2022 01:22:18 -0600
Subject: [PATCH] Flora: rock fix (#7333)

---
 Resources/Prototypes/Decals/flora.yml         |  21 --------
 .../Entities/Objects/Decoration/flora.yml     |  47 ++++++++++++++++++
 .../Decals/Flora/flora_rocks.rsi/meta.json    |   9 ----
 .../Flora/flora_rockssolid.rsi/meta.json      |  20 ++++++++
 .../flora_rockssolid.rsi/rocksolid01.png}     | Bin
 .../flora_rockssolid.rsi/rocksolid02.png}     | Bin
 .../flora_rockssolid.rsi/rocksolid03.png}     | Bin
 7 files changed, 67 insertions(+), 30 deletions(-)
 create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/meta.json
 rename Resources/Textures/{Decals/Flora/flora_rocks.rsi/rock08.png => Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid01.png} (100%)
 rename Resources/Textures/{Decals/Flora/flora_rocks.rsi/rock09.png => Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid02.png} (100%)
 rename Resources/Textures/{Decals/Flora/flora_rocks.rsi/rock10.png => Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid03.png} (100%)

diff --git a/Resources/Prototypes/Decals/flora.yml b/Resources/Prototypes/Decals/flora.yml
index c5cc648e5b..3955ca53dd 100644
--- a/Resources/Prototypes/Decals/flora.yml
+++ b/Resources/Prototypes/Decals/flora.yml
@@ -712,27 +712,6 @@
     sprite: Decals/Flora/flora_rocks.rsi
     state: rock07
 
-- type: decal
-  id: Rock08
-  tags: ["flora"]
-  sprite:
-    sprite: Decals/Flora/flora_rocks.rsi
-    state: rock08
-
-- type: decal
-  id: Rock09
-  tags: ["flora"]
-  sprite:
-    sprite: Decals/Flora/flora_rocks.rsi
-    state: rock09
-
-- type: decal
-  id: Rock10
-  tags: ["flora"]
-  sprite:
-    sprite: Decals/Flora/flora_rocks.rsi
-    state: rock10
-
 - type: decal
   id: Flowersbr1
   tags: ["flora"]
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 24d6a6110a..f77c1df792 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -1,5 +1,28 @@
+- type: entity
+  id: BaseRock
+  description: Heavy as a really heavy thing.
+  abstract: true
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_rockssolid.rsi
+    netsync: false
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.4
+      mass: 500
+      layer:
+      - Opaque
+      - VaultImpassable
+  - type: Climbable
+
 - type: entity
   id: BaseTree
+  description: Yep, it's a tree.
   abstract: true
   components:
   - type: Clickable
@@ -70,6 +93,30 @@
       - Opaque
       - Impassable
 
+- type: entity
+  parent: BaseRock
+  id: FloraRockSolid01
+  name: rock
+  components:
+  - type: Sprite
+    state: rocksolid01
+
+- type: entity
+  parent: BaseRock
+  id: FloraRockSolid02
+  name: rock
+  components:
+  - type: Sprite
+    state: rocksolid02
+
+- type: entity
+  parent: BaseRock
+  id: FloraRockSolid03
+  name: rock
+  components:
+  - type: Sprite
+    state: rocksolid03
+
 - type: entity
   parent: BaseTree
   id: FloraTree01
diff --git a/Resources/Textures/Decals/Flora/flora_rocks.rsi/meta.json b/Resources/Textures/Decals/Flora/flora_rocks.rsi/meta.json
index 5a6f73e232..03307fe4b7 100644
--- a/Resources/Textures/Decals/Flora/flora_rocks.rsi/meta.json
+++ b/Resources/Textures/Decals/Flora/flora_rocks.rsi/meta.json
@@ -27,15 +27,6 @@
         },
         {
             "name": "rock07"
-        },
-        {
-            "name": "rock08"
-        },
-        {
-            "name": "rock09"
-        },
-        {
-            "name": "rock10"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/meta.json
new file mode 100644
index 0000000000..f0907edf84
--- /dev/null
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/74bda160b97739cb9159dd19fe0800a5526735c0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rocksolid01"
+        },
+        {
+            "name": "rocksolid02"
+        },
+        {
+            "name": "rocksolid03"
+        }
+    ]
+}
diff --git a/Resources/Textures/Decals/Flora/flora_rocks.rsi/rock08.png b/Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid01.png
similarity index 100%
rename from Resources/Textures/Decals/Flora/flora_rocks.rsi/rock08.png
rename to Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid01.png
diff --git a/Resources/Textures/Decals/Flora/flora_rocks.rsi/rock09.png b/Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid02.png
similarity index 100%
rename from Resources/Textures/Decals/Flora/flora_rocks.rsi/rock09.png
rename to Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid02.png
diff --git a/Resources/Textures/Decals/Flora/flora_rocks.rsi/rock10.png b/Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid03.png
similarity index 100%
rename from Resources/Textures/Decals/Flora/flora_rocks.rsi/rock10.png
rename to Resources/Textures/Objects/Decoration/Flora/flora_rockssolid.rsi/rocksolid03.png