From e9ce54e397d3145c849b09858c53812ce565b14c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 3 Jan 2019 07:32:39 -0800 Subject: [PATCH 1/4] Update snacks_bread.dm --- code/modules/food_and_drinks/food/snacks_bread.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 0638bfad25..99e561d338 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -185,6 +185,13 @@ icon_state = "" bitesize = 2 +GLOBAL_VAR_INIT(frying_hardmode, TRUE) +GLOBAL_LIST_INIT(frying_bad_chems, list( +"bad_food" = 10, +"clf3" = 2, +"aranesp" = 2 +)) + /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried) . = ..() name = fried.name //We'll determine the other stuff when it's actually removed @@ -210,6 +217,11 @@ else fried.forceMove(src) trash = fried + if(!istype(fried, /obj/item/reagent_containers/food) && GLOB.frying_hardmode && GLOB.frying_bad_chems.len) + var/R = rand(1, GLOB.frying_bad_chems.len) + var/bad_chem = GLOB.frying_bad_chems[R] + var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem] + add_reagent(bad_chem, bad_chem_amount) /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy() if(trash) From bacb74ad470ac30e32450c796d6d9e877d473ab9 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 3 Jan 2019 07:34:09 -0800 Subject: [PATCH 2/4] Update snacks_bread.dm --- code/modules/food_and_drinks/food/snacks_bread.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 99e561d338..68d5cb8e99 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -189,7 +189,10 @@ GLOBAL_VAR_INIT(frying_hardmode, TRUE) GLOBAL_LIST_INIT(frying_bad_chems, list( "bad_food" = 10, "clf3" = 2, -"aranesp" = 2 +"aranesp" = 2, +"blackpowder" = 10, +"phlogiston" = 3, +"cyanide" = 3, )) /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried) From a1836c98afa4a9960451e0b5956ef1c97cf555f5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 3 Jan 2019 07:37:04 -0800 Subject: [PATCH 3/4] Update snacks_bread.dm --- code/modules/food_and_drinks/food/snacks_bread.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 68d5cb8e99..219c3dedf2 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -186,6 +186,7 @@ bitesize = 2 GLOBAL_VAR_INIT(frying_hardmode, TRUE) +GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE) GLOBAL_LIST_INIT(frying_bad_chems, list( "bad_food" = 10, "clf3" = 2, @@ -224,6 +225,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( var/R = rand(1, GLOB.frying_bad_chems.len) var/bad_chem = GLOB.frying_bad_chems[R] var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem] + if(GLOB.frying_bad_chem_add_volume) + reagents.maximum_volume += bad_chem_amount add_reagent(bad_chem, bad_chem_amount) /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy() From 71cf822138b82f8ba3403c22446082d1086b4e3e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 3 Jan 2019 08:19:06 -0800 Subject: [PATCH 4/4] Update snacks_bread.dm --- code/modules/food_and_drinks/food/snacks_bread.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 219c3dedf2..0f11fc8ed2 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem] if(GLOB.frying_bad_chem_add_volume) reagents.maximum_volume += bad_chem_amount - add_reagent(bad_chem, bad_chem_amount) + reagents.add_reagent(bad_chem, bad_chem_amount) /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy() if(trash)