diff --git a/modular_nova/modules/colony_fabricator/code/design_datums/appliances.dm b/modular_nova/modules/colony_fabricator/code/design_datums/appliances.dm index 8a4a70f318f..f56bc6037e1 100644 --- a/modular_nova/modules/colony_fabricator/code/design_datums/appliances.dm +++ b/modular_nova/modules/colony_fabricator/code/design_datums/appliances.dm @@ -25,6 +25,13 @@ "co2_cracker", "portable_recycler", "foodricator", +<<<<<<< HEAD +======= + "wall_heater", + "macrowave", + "frontier_range", + "tabletop_griddle", +>>>>>>> 21b58a477 (makes the tabletop griddle actually printable (#583)) ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000000000000000) // God save you hidden = TRUE