Merge pull request #5429 from Novacat/nova-basicfixes

Ease of Eating Changes

code/datums/supplypacks/hospitality_vr.dm

@@ -79,6 +79,3 @@
 	cost = 50
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Chinese takeout crate"
-
-/datum/supply_pack/randomised/hospitality/pizza
-	cost = 25

code/modules/food/food/snacks_vr.dm

@@ -597,16 +597,16 @@
 	filled = TRUE
 
 /obj/item/pizzabox/margherita/Initialize()
-	pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen(src)
+	pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo(src)
 
 /obj/item/pizzabox/vegetable/Initialize()
-	pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen(src)
+	pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegcargo(src)
 
 /obj/item/pizzabox/mushroom/Initialize()
-	pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen(src)
+	pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo(src)
 
 /obj/item/pizzabox/meat/Initialize()
-	pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen(src)
+	pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/liquidprotein
 	name = "\improper LiquidProtein Ration"

code/modules/food/kitchen/microwave.dm

@@ -246,7 +246,7 @@
 		return
 	start()
 	if (reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run
-		if (!wzhzhzh(10))
+		if (!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves
 			abort()
 			return
 		abort()
@@ -257,17 +257,17 @@
 	if (!recipe)
 		dirty += 1
 		if (prob(max(10,dirty*5)))
-			if (!wzhzhzh(4))
+			if (!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves
 				abort()
 				return
 			muck_start()
-			wzhzhzh(4)
+			wzhzhzh(2) //VOREStation Edit - Quicker Microwaves
 			muck_finish()
 			cooked = fail()
 			cooked.loc = src.loc
 			return
 		else if (has_extra_item())
-			if (!wzhzhzh(4))
+			if (!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves
 				abort()
 				return
 			broke()
@@ -275,7 +275,7 @@
 			cooked.loc = src.loc
 			return
 		else
-			if (!wzhzhzh(10))
+			if (!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves
 				abort()
 				return
 			abort()
@@ -283,7 +283,7 @@
 			cooked.loc = src.loc
 			return
 	else
-		var/halftime = round(recipe.time/10/2)
+		var/halftime = round(recipe.time/20/2) //VOREStation Edit - Quicker Microwaves
 		if (!wzhzhzh(halftime))
 			abort()
 			return
@@ -303,7 +303,7 @@
 		if (stat & (NOPOWER|BROKEN))
 			return 0
 		use_power(500)
-		sleep(10)
+		sleep(5) //VOREStation Edit - Quicker Microwaves
 	return 1
 
 /obj/machinery/microwave/proc/has_extra_item()

code/modules/reagents/Chemistry-Recipes.dm

@@ -737,9 +737,12 @@
 		var/mob/living/L = holder.my_atom
 		if(L.stat != DEAD)
 			e.amount *= 0.5
+	//VOREStation Add Start
 	else
 		holder.clear_reagents() //No more powergaming by creating a tiny amount of this
+	//VORESTation Add End
 	e.start()
+	//holder.clear_reagents() //VOREStation Removal
 	return
 
 /datum/chemical_reaction/flash_powder
@@ -784,8 +787,10 @@
 	// 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
 	// 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
 	empulse(location, round(created_volume / 24), round(created_volume / 20), round(created_volume / 18), round(created_volume / 14), 1)
+	//VOREStation Edit Start
 	if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this
 		holder.clear_reagents()
+	//VOREStation Edit End
 	return
 
 /datum/chemical_reaction/nitroglycerin
@@ -804,10 +809,13 @@
 		var/mob/living/L = holder.my_atom
 		if(L.stat!=DEAD)
 			e.amount *= 0.5
+	//VOREStation Add Start
 	else
 		holder.clear_reagents() //No more powergaming by creating a tiny amount of this
+	//VOREStation Add End
 	e.start()
 
+	//holder.clear_reagents() //VOREStation Removal
 	return
 
 /datum/chemical_reaction/napalm
@@ -840,8 +848,10 @@
 	playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
 	spawn(0)
 		S.start()
+	//VOREStation Edit Start
 	if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this
 		holder.clear_reagents()
+	//VOREStation Edit End
 	return
 
 /datum/chemical_reaction/foam
@@ -861,8 +871,10 @@
 	var/datum/effect/effect/system/foam_spread/s = new()
 	s.set_up(created_volume, location, holder, 0)
 	s.start()
+	//VOREStation Edit Start
 	if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this
 		holder.clear_reagents()
+	//VOREStation Edit End
 	return
 
 /datum/chemical_reaction/metalfoam
@@ -2501,7 +2513,7 @@
 	id = "biomass"
 	result = "biomass"
 	required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1)
-	result_amount = 6	// Roughly 120u per phoron sheet //VOREStation Edit
+	result_amount = 1	// Roughly 20u per phoron sheet
 
 // Neutralization.
 

code/modules/reagents/Chemistry-Recipes_vr.dm

@@ -101,7 +101,7 @@
 	name = "Vermicetol"
 	id = "vermicetol"
 	result = "vermicetol"
-	required_reagents = list("kelotane" = 1, "dermaline" = 1, "shockchem" = 1, "phoron" = 0.1)
+	required_reagents = list("bicaridine" = 2, "shockchem" = 1, "phoron" = 0.1)
 	catalysts = list("phoron" = 5)
 	result_amount = 3
 
@@ -340,4 +340,10 @@
 			if(prob(50))
 				for(var/j = 1, j <= rand(1, 3), j++)
 					step(C, pick(NORTH,SOUTH,EAST,WEST))
-*/
+*/
+
+/datum/chemical_reaction/food/syntiflesh
+	required_reagents = list("blood" = 5, "clonexadone" = 1)
+
+/datum/chemical_reaction/biomass
+	result_amount = 6	// Roughly 120u per phoron sheet