From aa71656f9765661f6a34cb1f83e487af65bdea4e Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sat, 11 Jan 2020 03:50:10 -0700 Subject: [PATCH] Standards conformation --- code/modules/food/kitchen/microwave.dm | 23 ++++------------------- code/modules/food/kitchen/microwave_ch.dm | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 code/modules/food/kitchen/microwave_ch.dm diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index b8f5b9894a..33e885ddf5 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -12,7 +12,7 @@ var/operating = 0 // Is it on? var/dirty = 0 // = {0..100} Does it need cleaning? var/broken = 0 // ={0,1,2} How broken is it??? - var/circuit_item_capacity = 1 //how many items does the circuit add to max number of items + var/circuit_item_capacity = 1 //CHOMPStation Edit: how many items does the circuit add to max number of items var/item_level = 0 //CHOMP - items microwave can handle, 0 foodstuff, 1 materials - Jack var/global/list/datum/recipe/available_recipes // List of the recipes you can use var/global/list/acceptable_items // List of the items you can put in @@ -124,7 +124,7 @@ to_chat(user, "It's dirty!") return 1 else if(is_type_in_list(O,acceptable_items)) - if (contents.len>=(max_n_of_items + component_parts.len + circuit_item_capacity)) //Adds component_parts to the maximum number of items. + if (contents.len>=(max_n_of_items + component_parts.len + circuit_item_capacity)) //Adds component_parts to the maximum number of items. //CHOMP Edit: changed 1 to actually just be the circuit item capacity var. to_chat(user, "This [src] is full of ingredients, you cannot put more.") return 1 if(istype(O, /obj/item/stack) && O:get_amount() > 1) // This is bad, but I can't think of how to change it @@ -308,7 +308,7 @@ sleep(5) //VOREStation Edit - Quicker Microwaves return 1 -/obj/machinery/microwave/proc/has_extra_item() //CHOMP - coded to have different microwaves be able to handle different items - Jack +/obj/machinery/microwave/proc/has_extra_item() //CHOMP Addition - coded to have different microwaves be able to handle different items - Jack if(item_level == 0) for (var/obj/O in ((contents - component_parts) - circuit)) if ( \ @@ -328,6 +328,7 @@ ) return 1 return 0 +//CHOMPStation addition end. /obj/machinery/microwave/proc/start() src.visible_message("The microwave turns on.", "You hear a microwave.") @@ -408,19 +409,3 @@ if ("dispose") dispose() return - -/*********************************** -* CHOMP advanced microwave -************************************/ - - -/obj/machinery/microwave/advanced - name = "deluxe microwave" - icon = 'icons/obj/machines/machinery_ch.dmi' - circuit = /obj/item/weapon/circuitboard/microwave/advanced - circuit_item_capacity = 100 - item_level = 1 - -/obj/machinery/microwave/advanced/Initialize() - ..() - reagents.maximum_volume = 1000 diff --git a/code/modules/food/kitchen/microwave_ch.dm b/code/modules/food/kitchen/microwave_ch.dm new file mode 100644 index 0000000000..84308233ae --- /dev/null +++ b/code/modules/food/kitchen/microwave_ch.dm @@ -0,0 +1,15 @@ +/*********************************** +* CHOMP advanced microwave +************************************/ + + +/obj/machinery/microwave/advanced + name = "deluxe microwave" + icon = 'icons/obj/machines/machinery_ch.dmi' + circuit = /obj/item/weapon/circuitboard/microwave/advanced + circuit_item_capacity = 100 + item_level = 1 + +/obj/machinery/microwave/advanced/Initialize() + ..() + reagents.maximum_volume = 1000 \ No newline at end of file