Stalagmite Changes (#25646)

* initial commit

* remove unnecessary thing

* Revert "remove unnecessary thing"

This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.

* fix (real)

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 6a622d7beaa2489876c04a8b45ead993b653eb6b..a2dda827be71ac76fb9018e2dc4c6f82273e6237 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -173,6 +173,17 @@
   parent: BaseRock
   id: FloraStalagmite1
   components:
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 5
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite1
@@ -217,6 +228,55 @@
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite6
 
+- type: entity
+  parent: FloraStalagmite1
+  id: FloraGreyStalagmite1
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite1
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite2
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite2
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite3
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite3
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite4
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite4
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite5
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite5
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite6
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite6
+
+
 - type: entity
   parent: BaseTree
   id: FloraTree01

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png
new file mode 100644 (file)
index 0000000..f3da176
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png
new file mode 100644 (file)
index 0000000..73a494c
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png
new file mode 100644 (file)
index 0000000..afb1853
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png
new file mode 100644 (file)
index 0000000..0c0b6f8
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png
new file mode 100644 (file)
index 0000000..5fee678
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png
new file mode 100644 (file)
index 0000000..71598ea
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
index 33dc4fa07386a2e0b781b9d7ffc5e863b0f5bed2..02e5b17b2b03317406eb2d3c77c6fd769e5ce804 100644 (file)
--- a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384",
+    "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384, grey ones recolored by rosieposieeee (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -24,6 +24,24 @@
         },
         {
             "name": "stalagmite6"
+        },
+        {
+            "name": "grey_stalagmite1"
+        },
+        {
+            "name": "grey_stalagmite2"
+        },
+        {
+            "name": "grey_stalagmite3"
+        },
+        {
+            "name": "grey_stalagmite4"
+        },
+        {
+            "name": "grey_stalagmite5"
+        },
+        {
+            "name": "grey_stalagmite6"
         }
     ]
 }