diff --git a/code/modules/food/food/thecake_ch.dm b/code/modules/food/food/thecake_ch.dm
index 93aef1a06b..b7287d3dcd 100644
--- a/code/modules/food/food/thecake_ch.dm
+++ b/code/modules/food/food/thecake_ch.dm
@@ -125,7 +125,7 @@
name = "An unfinished cake"
desc = "A single layer of tasty delicious cake goodness, but it feels very incomplete..."
- icon = 'icons/obj/64x64.dmi'
+ icon = 'icons/obj/64x64_ch.dmi'
icon_state = "thecake_onelayer"
pixel_x = -16
@@ -403,7 +403,7 @@
name = "An unfinished cake"
desc = "A single layer of tasty delicious cake goodness, but it feels very incomplete..."
- icon = 'icons/obj/64x64.dmi'
+ icon = 'icons/obj/64x64_ch.dmi'
icon_state = "chaoscake_unfinished-1"
pixel_x = -16
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
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index e656794237..0eceb6add8 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -61,7 +61,7 @@
name = "glowberries"
seed_name = "glowberry"
display_name = "glowberry bush"
- kitchen_tag = "glowberries"
+ kitchen_tag = "glowberries" //CHOMP Addition
mutants = null
chems = list("nutriment" = list(1,10), "uranium" = list(3,5))
@@ -207,7 +207,7 @@
name = "bluespacetomato"
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
- kitchen_tag = "bluespacetomato"
+ kitchen_tag = "bluespacetomato" //CHOMP Addition
mutants = null
chems = list("nutriment" = list(1,20), "singulo" = list(10,5))
@@ -408,7 +408,7 @@
name = "libertycap"
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
- kitchen_tag = "libertycap"
+ kitchen_tag = "libertycap" //CHOMP Addition
mutants = null
chems = list("nutriment" = list(1), "stoxin" = list(3,3), "space_drugs" = list(1,25))
@@ -443,7 +443,7 @@
name = "destroyingangel"
seed_name = "destroying angel"
display_name = "destroying angel mushrooms"
- kitchen_tag = "destroyingangel"
+ kitchen_tag = "destroyingangel" //CHOMP Addition
mutants = null
chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25))
@@ -477,7 +477,7 @@
name = "glowshroom"
seed_name = "glowshroom"
display_name = "glowshrooms"
- kitchen_tag = "glowshrooms"
+ kitchen_tag = "glowshrooms" //CHOMP Addition
mutants = null
chems = list("radium" = list(1,20))
@@ -498,7 +498,7 @@
name = "plastic"
seed_name = "plastellium"
display_name = "plastellium"
- kitchen_tag = "plastellium"
+ kitchen_tag = "plastellium" //CHOMP Addition
mutants = null
chems = list("plasticide" = list(1,10))
diff --git a/icons/obj/64x64.dmi b/icons/obj/64x64.dmi
index 089261e954..0773896fa7 100644
Binary files a/icons/obj/64x64.dmi and b/icons/obj/64x64.dmi differ
diff --git a/icons/obj/64x64_ch.dmi b/icons/obj/64x64_ch.dmi
new file mode 100644
index 0000000000..eba8710141
Binary files /dev/null and b/icons/obj/64x64_ch.dmi differ