mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Add nutriment to config
This commit is contained in:
@@ -153,7 +153,6 @@ var/list/admin_verbs_debug = list(
|
|||||||
/client/proc/cmd_admin_dump_instances, // /vg/
|
/client/proc/cmd_admin_dump_instances, // /vg/
|
||||||
/client/proc/disable_bloodvirii, // /vg/
|
/client/proc/disable_bloodvirii, // /vg/
|
||||||
/client/proc/configFood,
|
/client/proc/configFood,
|
||||||
/client/proc/fryer_nutriment,
|
|
||||||
#ifdef PROFILE_MACHINES
|
#ifdef PROFILE_MACHINES
|
||||||
/client/proc/cmd_admin_dump_macprofile,
|
/client/proc/cmd_admin_dump_macprofile,
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
// Globals /////////////////////////////////////////////////////
|
// Globals /////////////////////////////////////////////////////
|
||||||
|
|
||||||
var/global/deepFriedEverything = 1
|
var/global/deepFriedEverything = 1
|
||||||
|
var/global/deepFriedNutriment = 1
|
||||||
var/global/foodNesting = 1
|
var/global/foodNesting = 1
|
||||||
|
|
||||||
/client/proc/configFood()
|
/client/proc/configFood()
|
||||||
@@ -23,8 +24,12 @@ var/global/foodNesting = 1
|
|||||||
. = (alert("Cereal Cereal Cereal?",,"Yes","No")=="Yes")
|
. = (alert("Cereal Cereal Cereal?",,"Yes","No")=="Yes")
|
||||||
if(.) foodNesting = 1
|
if(.) foodNesting = 1
|
||||||
else foodNesting = 0
|
else foodNesting = 0
|
||||||
|
. = (input("Deep Fried Nutriment? (1 to 50)"))
|
||||||
|
if(isnum(.) && (. in 1 to 50)) deepFriedNutriment = .
|
||||||
|
else usr << "That wasn't a valid number."
|
||||||
log_admin("[key_name(usr)] set deepFriedEverything to [deepFriedEverything].")
|
log_admin("[key_name(usr)] set deepFriedEverything to [deepFriedEverything].")
|
||||||
log_admin("[key_name(usr)] set foodNesting to [foodNesting].")
|
log_admin("[key_name(usr)] set foodNesting to [foodNesting].")
|
||||||
|
log_admin("[key_name(usr)] set deepFriedNutriment to [deepFriedNutriment]")
|
||||||
return
|
return
|
||||||
|
|
||||||
// Base (Oven) /////////////////////////////////////////////////
|
// Base (Oven) /////////////////////////////////////////////////
|
||||||
@@ -156,7 +161,7 @@ var/global/foodNesting = 1
|
|||||||
. = "It's already candy."
|
. = "It's already candy."
|
||||||
break
|
break
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/cooking/candy/makeFood(var/foodType)
|
/obj/machinery/cooking/candy/makeFood(var/foodType)
|
||||||
var/obj/item/I = new foodType(src.loc,src.ingredient)
|
var/obj/item/I = new foodType(src.loc,src.ingredient)
|
||||||
I.name = "[src.ingredient.name] [I.name]"
|
I.name = "[src.ingredient.name] [I.name]"
|
||||||
@@ -199,7 +204,7 @@ var/global/foodNesting = 1
|
|||||||
if((. == "valid") && (!foodNesting))
|
if((. == "valid") && (!foodNesting))
|
||||||
if(findtext(I.name,"cereal")) . = "It's already cereal."
|
if(findtext(I.name,"cereal")) . = "It's already cereal."
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/cooking/cerealmaker/makeFood()
|
/obj/machinery/cooking/cerealmaker/makeFood()
|
||||||
var/obj/item/weapon/reagent_containers/food/snacks/cereal/C = new(src.loc)
|
var/obj/item/weapon/reagent_containers/food/snacks/cereal/C = new(src.loc)
|
||||||
if(istype(src.ingredient,/obj/item/weapon/reagent_containers))
|
if(istype(src.ingredient,/obj/item/weapon/reagent_containers))
|
||||||
@@ -226,7 +231,7 @@ var/global/foodNesting = 1
|
|||||||
. = ..()
|
. = ..()
|
||||||
if((. == "valid") && (!foodNesting))
|
if((. == "valid") && (!foodNesting))
|
||||||
if(findtext(I.name,"fried")) . = "It's already deep-fried."
|
if(findtext(I.name,"fried")) . = "It's already deep-fried."
|
||||||
else if(findtext(I.name,"grilled")) . = "It's already grilled."
|
else if(findtext(I.name,"grilled")) . = "It's already grilled."
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/cooking/deepfryer/makeFood(var/item/I)
|
/obj/machinery/cooking/deepfryer/makeFood(var/item/I)
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
//Food items that are eaten normally and don't leave anything behind.
|
//Food items that are eaten normally and don't leave anything behind.
|
||||||
var/global/deepfry_nutriment = 1
|
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks
|
/obj/item/weapon/reagent_containers/food/snacks
|
||||||
name = "snack"
|
name = "snack"
|
||||||
@@ -2908,6 +2907,7 @@ var/global/deepfry_nutriment = 1
|
|||||||
New()
|
New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("nutriment", 3)
|
reagents.add_reagent("nutriment", 3)
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/deepfryholder
|
/obj/item/weapon/reagent_containers/food/snacks/deepfryholder
|
||||||
name = "Deep Fried Foods Holder Obj"
|
name = "Deep Fried Foods Holder Obj"
|
||||||
icon = 'icons/obj/food.dmi'
|
icon = 'icons/obj/food.dmi'
|
||||||
@@ -2916,7 +2916,7 @@ var/global/deepfry_nutriment = 1
|
|||||||
deepfried = 1
|
deepfried = 1
|
||||||
New()
|
New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("nutriment", deepfry_nutriment)
|
reagents.add_reagent("nutriment",deepFriedNutriment)
|
||||||
|
|
||||||
///////////////////////////////////////////
|
///////////////////////////////////////////
|
||||||
// new old food stuff from bs12
|
// new old food stuff from bs12
|
||||||
@@ -2991,17 +2991,3 @@ var/global/deepfry_nutriment = 1
|
|||||||
New()
|
New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("nutriment", 4)
|
reagents.add_reagent("nutriment", 4)
|
||||||
|
|
||||||
/client/proc/fryer_nutriment()
|
|
||||||
set name = "Toggle nutriment added by deep frying."
|
|
||||||
set desc = "Toggle the amount of nutriment added to things that have been deep fried."
|
|
||||||
set category = "Debug"
|
|
||||||
|
|
||||||
deepfry_nutriment = input("Please select an amount. Note: Setting this number below 1 can cause problems with deep fried food, and has been disabled.", "Select amount", "[deepfry_nutriment]") as text
|
|
||||||
if(deepfry_nutriment < 1)
|
|
||||||
deepfry_nutriment = 1
|
|
||||||
usr << "The nutriment has been set to 1. Please select a number that is above or equal to 1 next time."
|
|
||||||
|
|
||||||
log_admin("[key_name(usr)] set the base nutriment of deep fried foods to [deepfry_nutriment]")
|
|
||||||
message_admins("\blue [key_name(usr)] set the nutriment of deep fried foods to [deepfry_nutriment]", 1)
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user