From bf1b4ac36af9be6c139e6087b9ccfd77785fdb88 Mon Sep 17 00:00:00 2001
From: Quanteey <61941975+Quanteey@users.noreply.github.com>
Date: Thu, 7 Aug 2025 01:54:49 +0200
Subject: [PATCH] Revert "Improve Potted Plant Movability and Availability
 (#37591)"

This reverts commit 71601b778c234c16113ac394d89d6ca37208a672.
---
 .../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 395 -> 0 bytes
 .../potted_plants.rsi/inhand-right.png        | Bin 395 -> 0 bytes
 .../Furniture/potted_plants.rsi/meta.json     |  14 ++----
 6 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-left.png
 delete 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 2d8f27fdf8..ea717a62a3 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:
@@ -348,13 +348,3 @@
   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 6d86b6561c..68bfd33969 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -57,49 +57,6 @@
     # End DeltaV
     - id: PlushieThaven # IMP port
 
-- 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 8c93c8c033..36dc73269d 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -35,10 +35,6 @@
     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
deleted file mode 100644
index cb3b20778c411346ded1326df5d947693da99637..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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)N<H9X_IA{GtcdmQ8*1_(p|FM@H}aInhB8LLO%)Z;tM0zbrL>Qp;UO5e?rjujg)`
zFFTV*M2hi-^8A?9?1E(~f?@l<zcKFN`lPjiyXB7#M~qNf<A$_{Uj*L#Njh}SzrN|O
z{*4<qez-RrTsUu5g3YSsYF->sj84*1FE&4DIKR1m)r3CB-ELdAH7;az<-X~XetYMd
zoo+=wXTFE_b<eV%(lndt`k|Kh-1|g#X!fuMxCOMcPZ6|xn0UsY>uyiL;ln-p3d&bL
z7|h;lpd8cs^G%ziqpaM6<M$puJXpc3xQR{Rb6TJo(DSk-t`Q}{`DrEPiAAXl4mqWH
ki3N$7c_sP<dFi^z`6;Q%U!5i8fC?ErUHx3vIVCg!0NCxL0ssI2

diff --git a/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-right.png b/Resources/Textures/Structures/Furniture/potted_plants.rsi/inhand-right.png
deleted file mode 100644
index cb3b20778c411346ded1326df5d947693da99637..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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)N<H9X_IA{GtcdmQ8*1_(p|FM@H}aInhB8LLO%)Z;tM0zbrL>Qp;UO5e?rjujg)`
zFFTV*M2hi-^8A?9?1E(~f?@l<zcKFN`lPjiyXB7#M~qNf<A$_{Uj*L#Njh}SzrN|O
z{*4<qez-RrTsUu5g3YSsYF->sj84*1FE&4DIKR1m)r3CB-ELdAH7;az<-X~XetYMd
zoo+=wXTFE_b<eV%(lndt`k|Kh-1|g#X!fuMxCOMcPZ6|xn0UsY>uyiL;ln-p3d&bL
z7|h;lpd8cs^G%ziqpaM6<M$puJXpc3xQR{Rb6TJo(DSk-t`Q}{`DrEPiAAXl4mqWH
ki3N$7c_sP<dFi^z`6;Q%U!5i8fC?ErUHx3vIVCg!0NCxL0ssI2

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