From 5357724de7f935c06f9226f22a9f88af1901d454 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 28 Apr 2019 19:44:50 -0700 Subject: [PATCH 1/4] Rebalanced vent clog events. --- code/modules/events/vent_clog.dm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 75833fc086..45eeaa3a96 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -47,7 +47,22 @@ "hair_dye", "sugar", "white_glitter", - "growthserum" + "growthserum", + + "cooking_oil", + "frostoil", + "sodiumchloride", + "cornoil", + "uranium", + "carpet", + "firefighting_foam", + "semen", + "femcum", + "tearjuice", + "strange_reagent", + "spraytan", + "bluespace" + ) //needs to be chemid unit checked at some point @@ -87,8 +102,8 @@ else R.add_reagent(pick(saferChems), reagentsAmount) - var/datum/effect_system/smoke_spread/chem/C = new - C.set_up(R,16,T,TRUE) + var/datum/effect_system/smoke_spread/chem/smoke_machine/C = new + C.set_up(R,16,1,T) C.start() playsound(T, 'sound/effects/smoke.ogg', 50, 1, -3) From 0d7c4c89d3f49e759b5522e12c47c7ac942181c4 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 28 Apr 2019 19:47:12 -0700 Subject: [PATCH 2/4] actually lets not have this --- code/modules/events/vent_clog.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 45eeaa3a96..b23df56b71 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -60,8 +60,7 @@ "femcum", "tearjuice", "strange_reagent", - "spraytan", - "bluespace" + "spraytan" ) //needs to be chemid unit checked at some point From 4aaab992f58826b3435a36a2154b0401acb5c665 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Tue, 30 Apr 2019 11:53:48 -0700 Subject: [PATCH 3/4] Removed frost oil and spray tan, deep fried items now no longer delete themselves when consumed. --- code/modules/events/vent_clog.dm | 5 +---- code/modules/food_and_drinks/food/snacks_bread.dm | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index b23df56b71..8cd1706479 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -50,8 +50,6 @@ "growthserum", "cooking_oil", - "frostoil", - "sodiumchloride", "cornoil", "uranium", "carpet", @@ -59,8 +57,7 @@ "semen", "femcum", "tearjuice", - "strange_reagent", - "spraytan" + "strange_reagent" ) //needs to be chemid unit checked at some point diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 0f11fc8ed2..1cb8706ea5 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -234,11 +234,6 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( QDEL_NULL(trash) . = ..() -/obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater) - if(trash) - QDEL_NULL(trash) - ..() - /obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(cook_time = 30) switch(cook_time) if(0 to 15) From 8b935b9abfe9746b5fbcc633db1211ff8bd79b6c Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Thu, 9 May 2019 21:10:44 -0700 Subject: [PATCH 4/4] Reverts cooking change, adds safety checks. --- code/modules/events/vent_clog.dm | 6 +++--- code/modules/food_and_drinks/food/snacks_bread.dm | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 8cd1706479..f504565ab2 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -48,8 +48,6 @@ "sugar", "white_glitter", "growthserum", - - "cooking_oil", "cornoil", "uranium", "carpet", @@ -69,8 +67,10 @@ endWhen = rand(120, 180) for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines) var/turf/T = get_turf(temp_vent) - if(T && is_station_level(T.z) && !temp_vent.welded) + var/area/A = T.loc + if(T && is_station_level(T.z) && !temp_vent.welded && !A.safe) vents += temp_vent + if(!vents.len) return kill() diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 1cb8706ea5..0f11fc8ed2 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -234,6 +234,11 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( QDEL_NULL(trash) . = ..() +/obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater) + if(trash) + QDEL_NULL(trash) + ..() + /obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(cook_time = 30) switch(cook_time) if(0 to 15)