From 1d5774be1f03a37b86bd6beee2769c6e8da15a85 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Wed, 16 Oct 2024 13:43:14 -0400 Subject: [PATCH] Calorite Fix --- GainStation13/code/mechanics/calorite.dm | 4 ++++ code/datums/components/remote_materials.dm | 1 + code/modules/mining/machine_processing.dm | 2 +- code/modules/mining/machine_redemption.dm | 2 +- code/modules/mining/machine_silo.dm | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/GainStation13/code/mechanics/calorite.dm b/GainStation13/code/mechanics/calorite.dm index d9c4c35004..f058b3ef90 100644 --- a/GainStation13/code/mechanics/calorite.dm +++ b/GainStation13/code/mechanics/calorite.dm @@ -14,6 +14,7 @@ points = 40 custom_materials = list(/datum/material/calorite=MINERAL_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/calorite + mine_experience = 20 /obj/item/stack/sheet/mineral/calorite name = "calorite" @@ -25,7 +26,10 @@ novariants = TRUE grind_results = list(/datum/reagent/consumable/lipoifier = 2) point_value = 40 + custom_materials = list(/datum/material/calorite=MINERAL_MATERIAL_AMOUNT) merge_type = /obj/item/stack/sheet/mineral/calorite + material_type = /datum/material/calorite + walltype = /turf/closed/wall/mineral/calorite GLOBAL_LIST_INIT(calorite_recipes, list ( \ new/datum/stack_recipe("Calorite tile", /obj/item/stack/tile/mineral/calorite, 1, 4, 20), \ diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 8cfd8e45e0..52ae4970f9 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -67,6 +67,7 @@ handles linking back and forth. /datum/material/titanium, /datum/material/bluespace, /datum/material/plastic, + /datum/material/calorite, //GS13 EDIT ) mat_container = parent.AddComponent(/datum/component/material_container, allowed_mats, local_size, allowed_types=/obj/item/stack, _after_insert = after_insert) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 214e050e5a..af63661983 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -131,7 +131,7 @@ /obj/machinery/mineral/processing_unit/Initialize(mapload) . = ..() proximity_monitor = new(src, 1) - AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace), INFINITY, TRUE, /obj/item/stack) + AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/calorite), INFINITY, TRUE, /obj/item/stack) //GS13 EDIT stored_research = new /datum/techweb/specialized/autounlocking/smelter selected_material = SSmaterials.GetMaterialRef(/datum/material/iron) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 32b79343e8..d35f2b50ef 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -18,7 +18,7 @@ var/ore_pickup_rate = 15 var/ore_multiplier = 1 var/point_upgrade = 1 - var/list/ore_values = list(/datum/material/glass = 1, /datum/material/iron = 1, /datum/material/plasma = 15, /datum/material/silver = 16, /datum/material/gold = 18, /datum/material/titanium = 30, /datum/material/uranium = 30, /datum/material/diamond = 50, /datum/material/bluespace = 50, /datum/material/bananium = 60) + var/list/ore_values = list(/datum/material/glass = 1, /datum/material/iron = 1, /datum/material/plasma = 15, /datum/material/silver = 16, /datum/material/gold = 18, /datum/material/titanium = 30, /datum/material/uranium = 30, /datum/material/diamond = 50, /datum/material/bluespace = 50, /datum/material/bananium = 60, /datum/material/calorite = 30) //GS13 EDIT, CALORITE var/message_sent = FALSE var/list/ore_buffer = list() var/datum/techweb/stored_research diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index e6281bb695..133e88f751 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -27,6 +27,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs) /datum/material/titanium, /datum/material/bluespace, /datum/material/plastic, + /datum/material/calorite, //GS13 EDIT ) AddComponent(/datum/component/material_container, materials_list, INFINITY, allowed_types=/obj/item/stack, _disable_attackby=TRUE) if (!GLOB.ore_silo_default && mapload && is_station_level(z))