From c6c69ae5fe5e9b314d01d5808df27d92fd7779dc Mon Sep 17 00:00:00 2001
From: hazelrat <83198434+hazelrat@users.noreply.github.com>
Date: Sun, 19 Jan 2025 13:03:44 +0000
Subject: [PATCH] Armoury bullet casing fix (#20383)

During a recent PR, two singular 5.56mm bullet casings were mistakenly
added to the armoury to offset the removal of pre-loaded magazines from
the two burst rifles, instead of the two 5.56mm magazines that should've
been added to accurately offset this. This corrects that error.
---
 html/changelogs/hazelmouse-guns.yml | 58 +++++++++++++++++++++++++++++
 maps/sccv_horizon/sccv_horizon.dmm  | 12 +++---
 2 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/hazelmouse-guns.yml

diff --git a/html/changelogs/hazelmouse-guns.yml b/html/changelogs/hazelmouse-guns.yml
new file mode 100644
index 00000000000..e0b9e6f7bca
--- /dev/null
+++ b/html/changelogs/hazelmouse-guns.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: hazelmouse
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - qol: "The armory now contains six total 5.56mm carbine magazines, instead of four magazines and two singular 5.56mm bullet casings."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index e6f763db622..07528b45ba4 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -15983,10 +15983,6 @@
 	},
 /obj/item/storage/box/shotgunshells,
 /obj/item/storage/box/shotgunshells,
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/ammo_magazine/a556/carbine/polymer,
-/obj/item/ammo_magazine/a556/carbine/polymer,
 /obj/effect/floor_decal/corner_wide/paleblue/full{
 	dir = 4
 	},
@@ -16008,8 +16004,12 @@
 /obj/item/ammo_magazine/mc9mmt,
 /obj/item/ammo_magazine/mc9mmt,
 /obj/item/ammo_magazine/mc9mmt,
-/obj/item/ammo_casing/a556,
-/obj/item/ammo_casing/a556,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
+/obj/item/ammo_magazine/a556/carbine/polymer,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/armoury)
 "ckj" = (