shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calorite Fix

Browse Source
This commit is contained in:
Metis
2024-10-16 13:43:14 -04:00
parent 5072c705a5
commit 1d5774be1f
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/mechanics/calorite.dm
+4
View File
@@ -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), \
code/datums/components/remote_materials.dm
+1
View File
@@ -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)
code/modules/mining/machine_processing.dm
+1 -1
View File
@@ -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)
code/modules/mining/machine_redemption.dm
+1 -1
View File
@@ -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
code/modules/mining/machine_silo.dm
+1
View File
@@ -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))