i dunno what to do :c

shiptest-ss13 · Sep 28, 2023 · 39078f4 · 39078f4
1 parent 12742cf
commit 39078f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/modules/food_and_drinks/food/ration.dm b/code/modules/food_and_drinks/food/ration.dm
@@ -88,7 +88,7 @@
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list()
 
-/obj/item/reagent_containers/food/snacks/ration/attack(mob/living/M, mob/user, def_zone)
+/obj/item/reagent_containers/food/snacks/ration/condiment/attack(mob/living/M, mob/user, def_zone)
 	if (!is_drainable())
 		to_chat(user, "<span class='warning'>[src] is sealed shut!</span>")
 		return 0
@@ -121,7 +121,7 @@
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list()
 
-/obj/item/reagent_containers/food/snacks/ration/attack(mob/living/M, mob/user, def_zone)
+/obj/item/reagent_containers/food/snacks/ration/pack/attack(mob/living/M, mob/user, def_zone)
 	if (!is_drainable())
 		to_chat(user, "<span class='warning'>[src] is sealed shut!</span>")
 		return 0

diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -391,15 +391,16 @@
 	SIGNAL_HANDLER
 	UnregisterSignal(tocook, COMSIG_PARENT_QDELETING)
 	tocook.cut_overlay(ration_overlay)
+	tocook = null
 
 /obj/item/ration_heater/proc/cook()
 	var/cookturf = get_turf(tocook)
 	tocook.visible_message("<span class='notice'>\The [src] lets out a final hiss...</span>")
 	playsound(tocook, 'sound/items/cig_snuff.ogg', 50, 1)
 	if(istype(tocook, /obj/item/reagent_containers/food) || istype(tocook, /obj/item/grown))
 		tocook.visible_message("<span class='notice'>\The [tocook] is done warming up!</span>")
-		clear_cooking()
 		tocook.microwave_act()
+		clear_cooking()
 	if(uses == 0)
 		qdel()
 	else