Merge branch 'master' of https://github.com/KabKebab/GS13

GainStation13/code/mobs/races/caloritegolem.dm

@@ -79,24 +79,20 @@ var/charges = 3
 		to_chat(owner, "<span class='notice'>You recharge yourself with magical energy!</span>")
 
 
-
 /datum/action/innate/bless/Activate()
 	if(charges != 0)
 		charges -= 1
 		if(ishuman(owner))
 			to_chat(owner, "<span class='notice'>You bless the food around you!</span>")
 
-		for(var/obj/item/reagent_containers/food/O  in view(1, owner))
-			if(O.foodtype != BLESSED)
+		for(var/obj/item/reagent_containers/food/O in view(1, owner))
+			if(!O.blessed)
 				O.reagents.add_reagent(/datum/reagent/consumable/nutriment, 10)
 				O.desc += " It faintly glows with warm, orange energy..."
-				O.foodtype = BLESSED
-
+				O.blessed = 1
 	else
 		to_chat(owner, "<span class='notice'>You need to recharge...</span>")
 
-
-
 /datum/action/innate/unburden/Activate()
 	if(charges != 0)
 		charges -= 1

GainStation13/code/obj/items/minor_items.dm

@@ -27,10 +27,10 @@
 	list_reagents = list(/datum/reagent/blueberry_juice = 50)
 
 /obj/item/reagent_containers/glass/beaker/fizulphite
-	list_reagents = list(/datum/chemical_reaction/fizulphite = 50)
+	list_reagents = list(/datum/reagent/consumable/fizulphite = 50)
 
 /obj/item/reagent_containers/glass/beaker/extilphite
-	list_reagents = list(/datum/chemical_reaction/extilphite = 50)
+	list_reagents = list(/datum/reagent/consumable/extilphite = 50)
 
 /obj/item/reagent_containers/glass/beaker/calorite_blessing
 	list_reagents = list(/datum/reagent/consumable/caloriteblessing = 50)

code/__DEFINES/food.dm

@@ -14,7 +14,6 @@
 #define BREAKFAST	(1<<13)
 #define CLOTH 		(1<<14)
 #define ANTITOXIC 	(1<<15)
-#define BLESSED 	(1<<16)
 
 #define DRINK_NICE	1
 #define DRINK_GOOD	2

code/game/area/areas/centcom.dm

@@ -196,3 +196,13 @@
 	name = "City of Cogs"
 	icon_state = "purple"
 	hidden = FALSE
+
+
+/area/fatlab //GS13 - move this elsewhere later
+	name = "Mysterious Facility"
+	icon_state = "centcom"
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+	requires_power = FALSE
+	has_gravity = STANDARD_GRAVITY
+	noteleport = TRUE
+	flags_1 = NONE

code/modules/food_and_drinks/food.dm

@@ -15,6 +15,7 @@
 	resistance_flags = FLAMMABLE
 	var/foodtype = NONE
 	var/last_check_time
+	var/blessed = 0 // GS13
 
 /obj/item/reagent_containers/food/Initialize(mapload)
 	. = ..()
@@ -47,4 +48,4 @@
 				SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
 			last_check_time = world.time
 
-#undef STOP_SERVING_BREAKFAST
+#undef STOP_SERVING_BREAKFAST