Improve Potted Plant Movability and Availability (#37591)

* Added Purchasable Potted Plant Crate

* Removing some whitespace that made it in elsewhere

* Making Potted Plants Items and pickupable

* Revert Making potted plants not fade

This reverts part of commit a50a7def80c06e5be68a37263306007739952a28.

* Adding self to credits

* Fixing sus spacing

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index f4d29705d4601012c4098df496a041bdbd94c7fe..db84ce3b2c17bccfaa19997edb66de1e6be081b1 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -117,7 +117,7 @@
   cost: 500
   category: cargoproduct-category-name-fun
   group: market
-  
+
 - type: cargoProduct
   id: FunSharkPlushies
   icon:
@@ -347,3 +347,13 @@
   cost: 1500
   category: cargoproduct-category-name-fun
   group: market
+
+- type: cargoProduct
+  id: FunPlants
+  icon:
+    sprite: Structures/Furniture/potted_plants.rsi
+    state: random
+  product: CratePlants
+  cost: 1000
+  category: cargoproduct-category-name-fun
+  group: market

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index af57a565a6bf96842cd69344b24a8ae47864865b..18b0dc26d812a8bcb5af3db21d069f643a3111bd 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -43,6 +43,49 @@
     - id: PlushieArachind
     - id: PlushiePenguin
 
+- type: entityTable
+  id: AllPottedPlantsTable
+  table: !type:GroupSelector
+    children:
+    - id: PottedPlant0
+    - id: PottedPlant1
+    - id: PottedPlant2
+    - id: PottedPlant3
+    - id: PottedPlant4
+    - id: PottedPlant5
+    - id: PottedPlant6
+    - id: PottedPlant7
+    - id: PottedPlant8
+    - id: PottedPlant10
+    - id: PottedPlant11
+    - id: PottedPlant12
+    - id: PottedPlant13
+    - id: PottedPlant14
+    - id: PottedPlant15
+    - id: PottedPlant16
+    - id: PottedPlant17
+    - id: PottedPlant18
+    - id: PottedPlant19
+    - id: PottedPlant20
+    - id: PottedPlant21
+    - id: PottedPlant22
+    - id: PottedPlant23
+    - id: PottedPlant24
+    - id: PottedPlant26
+
+- type: entity
+  id: CratePlants
+  parent: CrateGenericSteel
+  name: plant crate
+  description: A variety pack of potted plants to spruce up your station!
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: AllPottedPlantsTable
+        rolls: !type:ConstantNumberSelector
+          value: 5
+
 - type: entity
   id: CrateFunPlushie
   parent: CrateGenericSteel

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index e47e8df41c64dbae6a492c173a3c64338ab99e5b..23d8c7b174833823683c18aa617bb8ff4b42905e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -35,6 +35,10 @@
     containers:
       stash: !type:ContainerSlot {}
   - type: Pullable
+  - type: MultiHandedItem
+  - type: Item
+    sprite: Structures/Furniture/potted_plants.rsi
+    size: Huge
   - type: Damageable
     damageContainer: StructuralInorganic # The pot. Not the plant. Or is it plastic?
   - type: Destructible

diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-left.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..cb3b207
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-right.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..cb3b207
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
index 19f57fd672ab243d9b39d467352dedc0297460cc..747117a5d04a96ec1d60cc8e341f03efb65d303e 100644 (file)
--- a/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/potted_plants.rsi/meta.json
@@ -1,13 +1,21 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation, plant-26 made by Fazansen(https://github.com/Fazansen)",
+  "copyright": "Taken from tgstation, plant-26 made by Fazansen(https://github.com/Fazansen), inhand-left and right made by Xeri(https://github.com/Xeri7)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-           {
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
       "name": "random",
       "delays": [
         [
@@ -269,4 +277,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}