From: ERROR404 <100093430+ERORR404V1@users.noreply.github.com>
Date: Wed, 20 Dec 2023 04:57:02 +0000 (+0500)
Subject: New plant (#22704)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fe1c301be5bcd25f77e4411009cb01defd1d849e;p=space-station-14.git

New plant (#22704)

New plant
---

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml
index 36b646a3e3..a61af1467b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml
@@ -35,6 +35,7 @@
       - PottedPlant22
       - PottedPlant23
       - PottedPlant24
+      - PottedPlant26
     chance: 1
 
 - type: entity
@@ -46,12 +47,12 @@
     layers:
       - state: red
       - sprite: Structures/Furniture/potted_plants.rsi
-        state: plant-26
+        state: plant-27
   - type: RandomSpawner
     offset: 0
     prototypes:
-      - PottedPlant26
       - PottedPlant27
       - PottedPlant28
       - PottedPlant29
+      - PottedPlant30
     chance: 1
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index 98f5a001da..72a445a8a4 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -235,34 +235,42 @@
   - type: Sprite
     state: plant-25
 
-#these are all the plastic plants. They inherit from the first one because they don't have
-#enough differences to warrant getting a unique abstract prototype. It's just the name and description.
 - type: entity
   id: PottedPlant26
   parent: PottedPlantBase
-  name: plastic potted plant
-  description: A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch.
+  description: Is it just me, or is it blinking?
   components:
   - type: Sprite
     state: plant-26
 
+#these are all the plastic plants. They inherit from the first one because they don't have
+#enough differences to warrant getting a unique abstract prototype. It's just the name and description.
 - type: entity
   id: PottedPlant27
-  parent: PottedPlant26
+  parent: PottedPlantBase
+  name: plastic potted plant
+  description: A fake, cheap looking, plastic tree. Perfect for people who kill every plant they touch.
   components:
   - type: Sprite
     state: plant-27
 
 - type: entity
   id: PottedPlant28
-  parent: PottedPlant26
+  parent: PottedPlant27
   components:
   - type: Sprite
     state: plant-28
 
 - type: entity
   id: PottedPlant29
-  parent: PottedPlant26
+  parent: PottedPlant27
   components:
   - type: Sprite
     state: plant-29
+
+- type: entity
+  id: PottedPlant30
+  parent: PottedPlant27
+  components:
+  - type: Sprite
+    state: plant-30
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
index 72ae51dc54..19f57fd672 100644
--- a/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation",
+  "copyright": "Taken from tgstation, plant-26 made by Fazansen(https://github.com/Fazansen)",
   "size": {
     "x": 32,
     "y": 32
@@ -227,7 +227,12 @@
       "name": "plant-26",
       "delays": [
         [
-          1.0
+          5,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
         ]
       ]
     },
@@ -254,6 +259,14 @@
           1.0
         ]
       ]
+    },
+    {
+      "name": "plant-30",
+      "delays": [
+        [
+          1.0
+        ]
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png
index a79b9e2da8..10b4667d89 100644
Binary files a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-26.png differ
diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png
index 1019885b91..a79b9e2da8 100644
Binary files a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-27.png differ
diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png
index d5cbefe63a..1019885b91 100644
Binary files a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-28.png differ
diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png
index c59c7e4277..d5cbefe63a 100644
Binary files a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-29.png differ
diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-30.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-30.png
new file mode 100644
index 0000000000..c59c7e4277
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/plant-30.png differ