From 18fa45addd6867c17f9a3c69955e1ccbb59c13c6 Mon Sep 17 00:00:00 2001 From: Xeri Marai <8867601+Xeri7@users.noreply.github.com> Date: Thu, 5 Jun 2025 18:36:31 -0500 Subject: [PATCH] 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 --- .../Prototypes/Catalog/Cargo/cargo_fun.yml | 12 ++++- .../Prototypes/Catalog/Fills/Crates/fun.yml | 43 ++++++++++++++++++ .../Structures/Furniture/potted_plants.yml | 4 ++ .../potted_plants.rsi/inhand-left.png | Bin 0 -> 395 bytes .../potted_plants.rsi/inhand-right.png | Bin 0 -> 395 bytes .../Furniture/potted_plants.rsi/meta.json | 14 ++++-- 6 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-left.png create mode 100644 Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-right.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index f4d29705d4..db84ce3b2c 100644 --- 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 af57a565a6..18b0dc26d8 100644 --- 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 e47e8df41c..23d8c7b174 100644 --- 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 index 0000000000000000000000000000000000000000..cb3b20778c411346ded1326df5d947693da99637 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!Bm#UwT!FN*hn9V%XVj`p3nRT5 zoptdc-UZ1~GufUo0p&PKg8YIR{zJgkQz1q`v5%fEjv*Cu-iA5y9aiAU_K^7h|6_yL zF)NQp;UO5e?rjujg)` zFFTV*M2hi-^8A?9?1E(~f?@lsj84*1FE&4DIKR1m)r3CB-ELdAH7;az<-X~XetYMd zoo+=wXTFE_buyiL;ln-p3d&bL z7|h;lpd8cs^G%ziqpaM6Qp;UO5e?rjujg)` zFFTV*M2hi-^8A?9?1E(~f?@lsj84*1FE&4DIKR1m)r3CB-ELdAH7;az<-X~XetYMd zoo+=wXTFE_buyiL;ln-p3d&bL z7|h;lpd8cs^G%ziqpaM6