From bbaa05dcdd6c04fbea8211ef70d9ff20ffba9e9f Mon Sep 17 00:00:00 2001
From: tgstation-server <tgstation-server@tgstation13.org>
Date: Wed, 7 Jun 2017 17:25:59 -0700
Subject: [PATCH] Automatic changelog generation for PR #28160 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-28160.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-28160.yml

diff --git a/html/changelogs/AutoChangeLog-pr-28160.yml b/html/changelogs/AutoChangeLog-pr-28160.yml
new file mode 100644
index 00000000000..148ba9dacd8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-28160.yml
@@ -0,0 +1,4 @@
+author: "QualityVan"
+delete-after: True
+changes: 
+  - bugfix: "The ORM now uses the intended amount of resources when making alloys"