TGS Test Merge (#6967)

citadel.dme

@@ -45,6 +45,7 @@
 #include "code\__DEFINES\coloration.dm"
 #include "code\__DEFINES\configuration.dm"
 #include "code\__DEFINES\construction.dm"
+#include "code\__DEFINES\cooking.dm"
 #include "code\__DEFINES\damage_organs.dm"
 #include "code\__DEFINES\directional.dm"
 #include "code\__DEFINES\dna.dm"
@@ -2850,6 +2851,7 @@
 #include "code\modules\food\recipes_fryer.dm"
 #include "code\modules\food\recipes_microwave.dm"
 #include "code\modules\food\recipes_oven.dm"
+#include "code\modules\food\recipes_stove.dm"
 #include "code\modules\food\drinkingglass\extras.dm"
 #include "code\modules\food\drinkingglass\glass1.dm"
 #include "code\modules\food\drinkingglass\glass2.dm"
@@ -2875,27 +2877,28 @@
 #include "code\modules\food\food\drinks.dm"
 #include "code\modules\food\food\ice_cream.dm"
 #include "code\modules\food\food\lunch.dm"
-#include "code\modules\food\food\sandwich.dm"
 #include "code\modules\food\food\snacks.dm"
 #include "code\modules\food\food\z_custom_food_vr.dm"
-#include "code\modules\food\food\snacks\meat.dm"
+#include "code\modules\food\food_2\_cooker.dm"
+#include "code\modules\food\food_2\_foodholder.dm"
+#include "code\modules\food\food_2\_ingredient.dm"
+#include "code\modules\food\food_2\culinary_construct.dm"
+#include "code\modules\food\food_2\foodholders.dm"
+#include "code\modules\food\food_2\serving.dm"
+#include "code\modules\food\food_2\cookers\fryer.dm"
+#include "code\modules\food\food_2\cookers\grill.dm"
+#include "code\modules\food\food_2\cookers\oven.dm"
+#include "code\modules\food\food_2\ingredients\dough_bread.dm"
+#include "code\modules\food\food_2\ingredients\meat.dm"
+#include "code\modules\food\food_2\ingredients\misc.dm"
+#include "code\modules\food\food_2\ingredients\veggies.dm"
 #include "code\modules\food\glass\bottle.dm"
 #include "code\modules\food\glass\bottle_vr.dm"
 #include "code\modules\food\glass\bottle\robot.dm"
 #include "code\modules\food\machinery\gibber.dm"
 #include "code\modules\food\machinery\microwave.dm"
 #include "code\modules\food\machinery\smartfridge.dm"
 #include "code\modules\food\machinery\smartfridge_vr.dm"
-#include "code\modules\food\machinery\appliance\_appliance.dm"
-#include "code\modules\food\machinery\appliance\_cooker.dm"
-#include "code\modules\food\machinery\appliance\_cooker_output.dm"
-#include "code\modules\food\machinery\appliance\_mixer.dm"
-#include "code\modules\food\machinery\appliance\candy.dm"
-#include "code\modules\food\machinery\appliance\cereal.dm"
-#include "code\modules\food\machinery\appliance\container.dm"
-#include "code\modules\food\machinery\appliance\fryer.dm"
-#include "code\modules\food\machinery\appliance\grill.dm"
-#include "code\modules\food\machinery\appliance\oven.dm"
 #include "code\modules\food\structures\icecream_cart.dm"
 #include "code\modules\frames\frame.dm"
 #include "code\modules\frames\frame_stage.dm"
@@ -2979,6 +2982,7 @@
 #include "code\modules\guidebook\guidebook.dm"
 #include "code\modules\guidebook\guidebook_section.dm"
 #include "code\modules\guidebook\sections\reagents.dm"
+#include "code\modules\guidebook\sections\recipes.dm"
 #include "code\modules\hardsuits\_rig.dm"
 #include "code\modules\hardsuits\activation.dm"
 #include "code\modules\hardsuits\rig_attackby.dm"

code/__DEFINES/cooking.dm

@@ -0,0 +1,25 @@
+#define RAW 1
+#define COOKED 2
+#define OVERCOOKED 3
+#define BURNT 4
+
+#define COOKINFO_TIME 1
+#define COOKINFO_NUTRIMULT 2
+#define COOKINFO_TASTE 3
+
+#define HEAT_LOW 1
+#define HEAT_MID 2
+#define HEAT_HIGH 3
+
+#define METHOD_OVEN "oven"
+#define METHOD_GRILL "grill"
+#define METHOD_STOVE "stove"
+#define METHOD_DEEPFRY "deep fryer"
+#define METHOD_MICROWAVE "microwave"
+#define METHOD_BLOWTORCH "blowtorch" //i know a welder isn't actually one but you actually use blowtorches in cooking
+#define METHOD_ENERGETIC_ANOMALY "energetic anomaly" //supermatter, tesla, etc
+
+#define WEIGHT_TASTE_DIVISOR 100
+#define WEIGHT_TASTE_DIVISION(X) X/WEIGHT_TASTE_DIVISOR
+
+#define INGREDIENT_COOKTIME_MAX_SEPERATION 5 SECONDS

code/__DEFINES/machinery.dm

@@ -219,3 +219,7 @@ if (!(DATUM.datum_flags & DF_ISPROCESSING)) {\
 #define ORION_GAMER_PAMPHLET -1
 //game begins to have a chance to warn sec and med
 #define ORION_GAMER_REPORT_THRESHOLD 2
+
+#define PROCESS_ON_SSMACHINES 0
+#define PROCESS_ON_SSFASTPROCESS 1
+#define PROCESS_ON_SSPROCESSING 2

code/__DEFINES/tools/functionality.dm

@@ -73,6 +73,10 @@ GLOBAL_REAL_VAR(_dyntool_image_states) = list(
 #define TOOL_USAGE_BUILDING_FRAMEWORK (1<<4)
 /// making tables, detailed furnishings, etc
 #define TOOL_USAGE_BUILDING_FURNISHINGS (1<<5)
+//doing weird stuff that is possibly dangerous and definitely not regulation
+#define TOOL_USAGE_INADVISABLE (1<<6)
+//doing cooking
+#define TOOL_USAGE_COOKING (1<<7)
 
 //? tool_locked var
 

code/__HELPERS/lists/types_typecaches.dm

@@ -7,6 +7,15 @@
 			return TRUE
 	return FALSE
 
+/**
+ * Checks for specific types in a list.
+ */
+/proc/is_exact_type_in_list(atom/A, list/L)
+	for(var/type in L)
+		if(A.type == type)
+			return TRUE
+	return FALSE
+
 /**
  * Checks for specific types in a list.
  */

code/__HELPERS/sorts/comparators.dm

@@ -147,7 +147,7 @@ GLOBAL_VAR_INIT(cmp_field, "name")
  * Compares complexity of recipes for use in cooking, etc.
  * This is for telling which recipe to make, not for showing things to the player.
  */
-/proc/cmp_recipe_complexity_dsc(datum/recipe/A, datum/recipe/B)
+/proc/cmp_recipe_complexity_dsc(datum/cooking_recipe/A, datum/cooking_recipe/B)
 	var/a_score = LAZYLEN(A.items) + LAZYLEN(A.reagents) + LAZYLEN(A.fruit)
 	var/b_score = LAZYLEN(B.items) + LAZYLEN(B.reagents) + LAZYLEN(B.fruit)
 	return b_score - a_score

code/controllers/subsystem/early_init.dm

@@ -6,5 +6,6 @@ SUBSYSTEM_DEF(early_init)
 
 /datum/controller/subsystem/early_init/Initialize()
 	init_inventory_slot_meta()
+	init_cooking_recipes_glob()
 	init_crayon_decal_meta()
 	return SS_INIT_SUCCESS

code/datums/recipe/crafting_recipes/recipes_clothing.dm

@@ -356,7 +356,7 @@
 /datum/crafting_recipe/garlic_necklace
 	name = "Garlic Necklace"
 	result = /obj/item/clothing/neck/garlic_necklace
-	reqs = list(/obj/item/reagent_containers/food/snacks/grown/garlic = 15,
+	reqs = list(/obj/item/reagent_containers/food/snacks/ingredient/grown/garlic = 15,
 				/obj/item/stack/cable_coil = 10)
 	time = 100 //Takes awhile to put all the garlics on the coil and knot it.
 	category = CAT_CLOTHING

code/datums/recipe/crafting_recipes/recipes_misc.dm

@@ -65,7 +65,7 @@
 	result =/obj/structure/closet/crate/coffin/meatcoffin
 	tools = list(/obj/item/kitchen/knife,
 				 /obj/item/kitchen/rollingpin)
-	reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5,
+	reqs = list(/obj/item/reagent_containers/food/snacks/ingredient/meat/slab = 5,
 				/obj/item/restraints/handcuffs/cable = 1)
 	time = 150
 	subcategory = CAT_FURNITURE
@@ -634,7 +634,7 @@
 	name = "Coconut Bong"
 	result = /obj/item/bong/coconut
 	reqs = list(/obj/item/stack/material/mineral/bamboo = 2,
-				/obj/item/reagent_containers/food/snacks/grown/coconut = 1)
+				/obj/item/reagent_containers/food/snacks/ingredient/grown/coconut = 1)
 	time = 70
 	subcategory = CAT_MISCELLANEOUS
 	category = CAT_MISCELLANEOUS

code/datums/recipe/crafting_recipes/recipes_primal.dm

@@ -497,17 +497,6 @@
 	category = CAT_PRIMAL
 	always_available = FALSE
 
-/datum/crafting_recipe/cooking_spit
-	name = "Cooking Spit"
-	result = /obj/machinery/appliance/cooker/grill/spit
-	time = 200
-	reqs = list(/obj/item/stack/material/bone = 10,
-				/obj/item/stack/sinew = 10,
-				/obj/item/pen/charcoal = 5
-				)
-	category = CAT_PRIMAL
-	always_available = FALSE
-
 /datum/crafting_recipe/stone_dropper
 	name = "Primitive Dropper"
 	result = /obj/item/reagent_containers/dropper/ashlander