diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index b77b355922..3efc70c04b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -17,3 +17,5 @@
     TomatoSeeds: 10
     TowercapSeeds: 10
     WheatSeeds: 10
+    AloeSeeds: 10
+    PoppySeeds: 10
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index be2f730c7b..0eb2975e88 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -577,3 +577,47 @@
       sprite: Objects/Specific/Hydroponics/chili.rsi
     - type: Produce
       seed: chili
+
+- type: entity
+  name: aloe
+  parent: FoodProduceBase
+  id: FoodAloe
+  description: A fragrant plant with soothing properties.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12 ##I'm pretty sure this has to match the total of 100 potency yields
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Kelotane
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/aloe.rsi
+  - type: Produce
+    seed: aloe
+  - type: Extractable
+    grindableSolutionName: food
+
+- type: entity
+  name: poppy
+  parent: FoodProduceBase
+  id: FoodPoppy
+  description: A flower with extracts often used in the production of medicine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Bicaridine
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/poppy.rsi
+  - type: Produce
+    seed: poppy
+  - type: Extractable
+    grindableSolutionName: food
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index d6a280e6d6..a74d82b86f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -203,3 +203,25 @@
       seed: chili
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/chili.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of aloe seeds
+  description: "Soothing."
+  id: AloeSeeds
+  components:
+    - type: Seed
+      seed: aloe
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/aloe.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of poppy seeds
+  description: "Do not eat within 72 hours of a drug test."
+  id: PoppySeeds
+  components:
+    - type: Seed
+      seed: poppy
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/poppy.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 6c6abc7ca7..267bcaa9aa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -61,3 +61,15 @@
         Piercing: -5
   - type: Stack
     stackType: Gauze
+
+- type: entity
+  name: aloe cream
+  description: A topical cream for burns.
+  parent: Ointment ##Yes it's a direct reskin
+  id: AloeCream
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Specific/Hydroponics/aloe.rsi
+    state: cream
+
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index b4a1557a00..894f9053a8 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -469,3 +469,51 @@
       Min: 1
       Max: 10
       PotencyDivisor: 10
+
+- type: seed
+  id: poppy
+  name: poppy
+  seedName: poppy
+  displayName: poppies
+  plantRsi: Objects/Specific/Hydroponics/poppy.rsi
+  productPrototypes:
+    - FoodPoppy
+  lifespan: 25
+  maturation: 10
+  production: 1
+  yield: 5
+  potency: 10
+  growthStages: 3
+  waterConsumption: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 2
+    Bicaridine:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+
+- type: seed
+  id: aloe
+  name: aloe
+  seedName: aloe
+  displayName: aloe
+  plantRsi: Objects/Specific/Hydroponics/aloe.rsi
+  productPrototypes:
+    - FoodAloe
+  lifespan: 25
+  maturation: 10
+  production: 1
+  yield: 5
+  potency: 10
+  growthStages: 5
+  waterConsumption: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 2
+    Kelotane:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index f82f4513b4..599ad7ba08 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -495,3 +495,11 @@
   time: 10
   solids:
     LeavesCannabis: 1
+
+- type: microwaveMealRecipe
+  id: RecipeAloeCream
+  name: aloe cream recipe
+  result: AloeCream
+  time: 10
+  solids:
+    FoodAloe: 1
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png
new file mode 100644
index 0000000000..dc5314d5db
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/cream.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/dead.png
new file mode 100644
index 0000000000..331639ed2e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/harvest.png
new file mode 100644
index 0000000000..abfa423793
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
new file mode 100644
index 0000000000..88233c4476
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "cream"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
new file mode 100644
index 0000000000..68f2133a99
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/seed.png
new file mode 100644
index 0000000000..9884c55e74
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-1.png
new file mode 100644
index 0000000000..7b2ea1af7d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-2.png
new file mode 100644
index 0000000000..184dab3575
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-3.png
new file mode 100644
index 0000000000..1c1de6661d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-4.png
new file mode 100644
index 0000000000..69fabf4da3
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-5.png
new file mode 100644
index 0000000000..48498a4e39
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/dead.png
new file mode 100644
index 0000000000..849b4242b4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/harvest.png
new file mode 100644
index 0000000000..99ad68a5d2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
new file mode 100644
index 0000000000..8b6952d030
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
new file mode 100644
index 0000000000..de8601d255
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/seed.png
new file mode 100644
index 0000000000..974f03ca79
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-1.png
new file mode 100644
index 0000000000..1e582f9231
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-2.png
new file mode 100644
index 0000000000..090715f6a0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-3.png
new file mode 100644
index 0000000000..edcd8617dc
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/stage-3.png differ