From ddfecf85f5719082b397243a9e8411c803c96c93 Mon Sep 17 00:00:00 2001
From: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
Date: Wed, 31 Aug 2022 22:20:26 +1000
Subject: [PATCH] - Converts honeycomb from reagent_containers to type
 reagent_containers/food/snacks. (#18922)

- Adds honeycomb as an item that can be picked up in plant bags.
---
 code/game/objects/items/weapons/storage/bags.dm        |  2 +-
 code/modules/hydroponics/beekeeping/beebox.dm          |  4 ++--
 code/modules/hydroponics/beekeeping/honeycomb.dm       | 10 +++++-----
 .../reagents/chemistry/machinery/reagentgrinder.dm     |  3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 16989a09521..3eab3870713 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -170,7 +170,7 @@
 	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = WEIGHT_CLASS_NORMAL
 	w_class = WEIGHT_CLASS_TINY
-	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora)
+	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora,/obj/item/reagent_containers/food/snacks/honeycomb)
 	resistance_flags = FLAMMABLE
 
 /obj/item/storage/bag/plants/portaseeder
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 10bed630a13..d422a4d2f63 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -96,7 +96,7 @@
 		if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST)
 			if(honeycombs.len < get_max_honeycomb())
 				bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
-				var/obj/item/reagent_containers/honeycomb/HC = new(src)
+				var/obj/item/reagent_containers/food/snacks/honeycomb/HC = new(src)
 				if(queen_bee.beegent)
 					HC.set_reagent(queen_bee.beegent.id)
 				honeycombs += HC
@@ -245,7 +245,7 @@
 						var/amtH = HF.honeycomb_capacity
 						var/fallen = 0
 						while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
-							var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
+							var/obj/item/reagent_containers/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
 							if(HC)
 								HC.forceMove(get_turf(src))
 								amtH--
diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
index a8e51e60fc2..e4bcdb13a33 100644
--- a/code/modules/hydroponics/beekeeping/honeycomb.dm
+++ b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -1,5 +1,5 @@
 
-/obj/item/reagent_containers/honeycomb
+/obj/item/reagent_containers/food/snacks/honeycomb
 	name = "honeycomb"
 	desc = "A hexagonal mesh of honeycomb."
 	icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -11,16 +11,16 @@
 	list_reagents = list("honey" = 5)
 	var/honey_color = ""
 
-/obj/item/reagent_containers/honeycomb/Initialize(mapload)
+/obj/item/reagent_containers/food/snacks/honeycomb/Initialize(mapload)
 	. = ..()
 	pixel_x = rand(8,-8)
 	pixel_y = rand(8,-8)
 	update_icon(UPDATE_OVERLAYS)
 
-/obj/item/reagent_containers/honeycomb/set_APTFT()
+/obj/item/reagent_containers/food/snacks/honeycomb/set_APTFT()
 	set hidden = TRUE
 
-/obj/item/reagent_containers/honeycomb/update_overlays()
+/obj/item/reagent_containers/food/snacks/honeycomb/update_overlays()
 	. = ..()
 	var/image/honey
 	if(honey_color)
@@ -31,7 +31,7 @@
 	. += honey
 
 
-/obj/item/reagent_containers/honeycomb/proc/set_reagent(reagent)
+/obj/item/reagent_containers/food/snacks/honeycomb/proc/set_reagent(reagent)
 	var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
 	if(istype(R))
 		name = "honeycomb ([R.name])"
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index d236b9d476f..41517ba6ab2 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -52,8 +52,7 @@
 
 		//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
 		/obj/item/slime_extract = list(),
-		/obj/item/reagent_containers/food = list(),
-		/obj/item/reagent_containers/honeycomb = list()
+		/obj/item/reagent_containers/food = list()
 	)
 
 	var/list/juice_items = list (