cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standards conformation

Browse Source
This commit is contained in:
Razgriz
2020-01-11 03:50:10 -07:00
committed by GitHub
parent 9cb8d1eaab
commit aa71656f97
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/food/kitchen/microwave.dm
View File

@@ -12,7 +12,7 @@
var/operating = 0 // Is it on? var/operating = 0 // Is it on?
var/dirty = 0 // = {0..100} Does it need cleaning? var/dirty = 0 // = {0..100} Does it need cleaning?
var/broken = 0 // ={0,1,2} How broken is it??? 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/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/datum/recipe/available_recipes // List of the recipes you can use
var/global/list/acceptable_items // List of the items you can put in var/global/list/acceptable_items // List of the items you can put in
@@ -124,7 +124,7 @@
to_chat(user, "<span class='warning'>It's dirty!</span>") to_chat(user, "<span class='warning'>It's dirty!</span>")
return 1 return 1
else if(is_type_in_list(O,acceptable_items)) 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, "<span class='warning'>This [src] is full of ingredients, you cannot put more.</span>") to_chat(user, "<span class='warning'>This [src] is full of ingredients, you cannot put more.</span>")
return 1 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 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 sleep(5) //VOREStation Edit - Quicker Microwaves
return 1 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) if(item_level == 0)
for (var/obj/O in ((contents - component_parts) - circuit)) for (var/obj/O in ((contents - component_parts) - circuit))
if ( \ if ( \
@@ -328,6 +328,7 @@
) )
return 1 return 1
return 0 return 0
//CHOMPStation addition end.
/obj/machinery/microwave/proc/start() /obj/machinery/microwave/proc/start()
src.visible_message("<span class='notice'>The microwave turns on.</span>", "<span class='notice'>You hear a microwave.</span>") src.visible_message("<span class='notice'>The microwave turns on.</span>", "<span class='notice'>You hear a microwave.</span>")
@@ -408,19 +409,3 @@
if ("dispose") if ("dispose")
dispose() dispose()
return 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

15
code/modules/food/kitchen/microwave_ch.dm Normal file
View File

@@ -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