Merge branch 'master' into powerdrawrebalance

shiptest-ss13 · Jan 24, 2024 · 5300c99 · 5300c99
2 parents 1051a3b + 808526d
commit 5300c99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
@@ -254,7 +254,7 @@
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 	materials.use_materials(alloy.materials, amount)
 
-	generate_mineral(alloy.build_path)
+	generate_mineral(alloy.build_path, amount)
 
 /obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D)
 	if(D.make_reagents.len)
@@ -272,8 +272,8 @@
 
 	return build_amount
 
-/obj/machinery/mineral/processing_unit/proc/generate_mineral(P)
-	var/O = new P(src)
+/obj/machinery/mineral/processing_unit/proc/generate_mineral(P, amount)
+	var/O = new P(src, amount)
 	unload_mineral(O)
 
 /obj/machinery/mineral/processing_unit/on_deconstruction()

diff --git a/html/changelogs/AutoChangeLog-pr-2646.yml b/html/changelogs/AutoChangeLog-pr-2646.yml
diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml
@@ -55,3 +55,10 @@
   - tweak: Descriptions of multiple clothing items.
   - rscadd: SecHuds now identify factions. Somewhat.
   - rscadd: More desperate groups of Frontiersmen have been spotted roaming the frontier.
+2024-01-19:
+  SomeguyManperson:
+  - tweak: tend brute/burns can no longer attempt to (very ineffectively) heal the
+      other damage type
+2024-01-23:
+  SomeguyManperson:
+  - bugfix: ore smelter no longer obliterates materials when smelting alloys