shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverts cooking change, adds safety checks.

Browse Source
This commit is contained in:
BurgerLua
2019-05-09 21:10:44 -07:00
parent 4aaab992f5
commit 8b935b9abf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/vent_clog.dm
+3 -3
View File
@@ -48,8 +48,6 @@
"sugar", "sugar",
"white_glitter", "white_glitter",
"growthserum", "growthserum",
"cooking_oil",
"cornoil", "cornoil",
"uranium", "uranium",
"carpet", "carpet",
@@ -69,8 +67,10 @@
endWhen = rand(120, 180) endWhen = rand(120, 180)
for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines) for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
var/turf/T = get_turf(temp_vent) 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 vents += temp_vent
if(!vents.len) if(!vents.len)
return kill() return kill()
code/modules/food_and_drinks/food/snacks_bread.dm
+5
View File
@@ -234,6 +234,11 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
QDEL_NULL(trash) 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) /obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(cook_time = 30)
switch(cook_time) switch(cook_time)
if(0 to 15) if(0 to 15)