Merge branch 'master' into gun-qol

shiptest-ss13 · May 31, 2024 · 88faeac · 88faeac
2 parents e84dc4e + ff1b4cb
commit 88faeac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
@@ -51,7 +51,7 @@
 							)
 
 /obj/machinery/autolathe/Initialize()
-	AddComponent(/datum/component/material_container,list(/datum/material/iron, /datum/material/glass, /datum/material/plastic, /datum/material/silver, /datum/material/gold, /datum/material/plasma, /datum/material/uranium, /datum/material/titanium), 0, TRUE, null, null, CALLBACK(src, PROC_REF(AfterMaterialInsert)))
+	AddComponent(/datum/component/material_container,list(/datum/material/iron, /datum/material/glass, /datum/material/plastic, /datum/material/silver, /datum/material/gold, /datum/material/plasma, /datum/material/uranium, /datum/material/titanium, /datum/material/hellstone), 0, TRUE, null, null, CALLBACK(src, PROC_REF(AfterMaterialInsert)))
 	. = ..()
 
 	wires = new /datum/wires/autolathe(src)

diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
@@ -17,7 +17,7 @@
 	var/points = 0
 	var/ore_multiplier = 1
 	var/point_upgrade = 1
-	var/list/ore_values = list(/datum/material/iron = 1, /datum/material/glass = 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/hellstone = 60)
+	var/list/ore_values = list(/datum/material/iron = 1, /datum/material/glass = 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)
 	/// Variable that holds a timer which is used for callbacks to `send_console_message()`. Used for preventing multiple calls to this proc while the ORM is eating a stack of ores.
 	var/console_notify_timer
 	var/datum/techweb/stored_research

diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
@@ -25,7 +25,6 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
 		/datum/material/titanium,
 		/datum/material/bluespace,
 		/datum/material/plastic,
-		/datum/material/hellstone,
 		)
 	AddComponent(/datum/component/material_container, materials_list, INFINITY, allowed_types=/obj/item/stack, _disable_attackby=TRUE)
 

diff --git a/html/changelogs/AutoChangeLog-pr-3045.yml b/html/changelogs/AutoChangeLog-pr-3045.yml
@@ -0,0 +1,4 @@
+author: FalloutFalcon
+changes:
+  - {tweak: tweaked the new ore}
+delete-after: true