From ce6aff7ebea1384f34dda138dfaf05e91112a1e1 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sat, 23 Sep 2023 16:58:16 -0500 Subject: [PATCH] 2% crayon chance,rations heat food,vodka has name --- code/game/objects/effects/spawners/lootdrop.dm | 2 +- code/modules/food_and_drinks/drinks/drinks.dm | 2 ++ code/modules/food_and_drinks/kitchen_machinery/microwave.dm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index bedf2c894b03..e43ffd7cb182 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -1273,5 +1273,5 @@ /obj/item/storage/ration/blackened_calamari = 5, /obj/item/storage/ration/elbow_macaroni = 5, /obj/item/storage/ration/cheese_pizza_slice = 5, - /obj/item/storage/ration/crayons + /obj/item/storage/ration/crayons = 2 // :) ) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 06c2b28e903c..7014270ba1b4 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -772,4 +772,6 @@ return ..() /obj/item/reagent_containers/food/drinks/ration/pan_genezan_vodka + name = "Pan-Genezan vodka" + desc = "Vodka made from the finest potatoes." list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 30) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 2db7ca58c817..808c6aa657ca 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -398,8 +398,8 @@ tocook.visible_message("\The [tocook] is done warming up!") playsound(tocook, 'sound/items/cig_snuff.ogg', 50, 1) if(istype(tocook, /obj/item/reagent_containers/food) || istype(tocook, /obj/item/grown)) - clear_cooking() tocook.microwave_act() + clear_cooking() if(uses == 0) qdel() else