From 1b9d60c604109f136d892f1a631365466d66e9c1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 19 Dec 2017 15:29:55 -0600 Subject: [PATCH] Update reagent_containers.dm --- code/modules/reagents/reagent_containers.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 842d2dc2c3..2645997d22 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -118,11 +118,5 @@ reagents.clear_reagents() /obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M) -<<<<<<< HEAD - if(is_open_container()) - reagents.chem_temp = max(reagents.chem_temp, 1000) - reagents.handle_reactions() -======= reagents.expose_temperature(1000) ->>>>>>> 40699a8... [READY]Refactors reagent container types (#33470) ..()