From c8f4e3a5bbb134366fd2b7cae8a48c38bde5fe37 Mon Sep 17 00:00:00 2001
From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com>
Date: Fri, 30 Aug 2024 19:21:23 -0400
Subject: [PATCH] Ammo resupply for VP70 and M4A3 (#425)

---
 code/datums/factions/clf.dm                  | 4 ++--
 code/game/objects/items/storage/misc.dm      | 4 ++--
 code/modules/projectiles/guns/revolvers.dm   | 2 +-
 maps/map_files/golden_arrow/golden_arrow.dmm | 8 ++++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/datums/factions/clf.dm b/code/datums/factions/clf.dm
index 8cd3756c41..45cedf3bbc 100644
--- a/code/datums/factions/clf.dm
+++ b/code/datums/factions/clf.dm
@@ -60,7 +60,7 @@
 		list("SIDEARMS", 0, null, null, null),
 		list("VP70 Combat Pistol", 15, /obj/item/weapon/gun/pistol/vp70, null, VENDOR_ITEM_REGULAR),
 		list("Beretta 92FS Pistol", 15, /obj/item/weapon/gun/pistol/b92fs, null, VENDOR_ITEM_REGULAR),
-		list("CMB Spearhead Autorevolver", 15, /obj/item/weapon/gun/revolver/spearhead, null, VENDOR_ITEM_REGULAR),
+		list("CMB Spearhead revolver", 15, /obj/item/weapon/gun/revolver/spearhead, null, VENDOR_ITEM_REGULAR),
 		list("Holdout Pistol", 10, /obj/item/weapon/gun/pistol/holdout, null, VENDOR_ITEM_REGULAR),
 		list("KT-42 Automag", 15, /obj/item/weapon/gun/pistol/kt42, null, VENDOR_ITEM_REGULAR),
 		list("S&W .357 Revolver", 15, /obj/item/weapon/gun/revolver/small, null, VENDOR_ITEM_REGULAR),
@@ -128,7 +128,7 @@
 		list("SIDEARMS", -1, null, null),
 		list("VP70 Combat Pistol", 20, /obj/item/weapon/gun/pistol/vp70, VENDOR_ITEM_REGULAR),
 		list("Beretta 92FS Pistol", 20, /obj/item/weapon/gun/pistol/b92fs, VENDOR_ITEM_REGULAR),
-		list("CMB Spearhead Autorevolver", 20, /obj/item/weapon/gun/revolver/spearhead, VENDOR_ITEM_REGULAR),
+		list("CMB Spearhead revolver", 20, /obj/item/weapon/gun/revolver/spearhead, VENDOR_ITEM_REGULAR),
 		list("Holdout Pistol", 20, /obj/item/weapon/gun/pistol/holdout, VENDOR_ITEM_REGULAR),
 		list("KT-42 Automag", 20, /obj/item/weapon/gun/pistol/kt42, VENDOR_ITEM_REGULAR),
 		list("S&W .357 Revolver", 20, /obj/item/weapon/gun/revolver/small, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm
index a51b1b6c16..33b2b5f778 100644
--- a/code/game/objects/items/storage/misc.dm
+++ b/code/game/objects/items/storage/misc.dm
@@ -166,7 +166,7 @@
 
 /obj/item/storage/box/loadout/Spearhead_loadout
 	name = "Spearhead Armoury storage case"
-	desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and additional speedloaders."
+	desc = "A relatively large storage case containing a loaded Spearhead Armoury revolver and additional speedloaders."
 
 /obj/item/storage/box/loadout/Spearhead_loadout/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead())
@@ -175,7 +175,7 @@
 
 /obj/item/storage/box/loadout/Spearhead_loadout/custom
 	name = "Spearhead Armoury storage case"
-	desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and additional speedloaders."
+	desc = "A relatively large storage case containing a loaded Spearhead Armoury revolver and additional speedloaders."
 
 /obj/item/storage/box/loadout/Spearhead_loadout/custom/fill_preset_inventory()
 	handle_item_insertion(new /obj/item/weapon/gun/revolver/spearhead/black())
diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm
index 91e298cb25..6fd17ef1a7 100644
--- a/code/modules/projectiles/guns/revolvers.dm
+++ b/code/modules/projectiles/guns/revolvers.dm
@@ -755,7 +755,7 @@
 	current_mag = /obj/item/ammo_magazine/internal/revolver/spearhead/hollowpoint
 
 /obj/item/weapon/gun/revolver/spearhead/black
-	name = "\improper Spearhead Armoury autorevolver"
+	name = "\improper Spearhead Armoury revolver"
 	desc = "A sleek high-quality revolver designed by Spearhead Armoury chambered in .357 commonly issued to Colonial Marshals, though this version has been customized with a black metal finish indicating it is unlikely to be a service weapon."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi'
 	icon_state = "spearhead_black"
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index cae623c242..731a3337c3 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -9827,6 +9827,14 @@
 	},
 /obj/structure/surface/rack,
 /obj/item/storage/box/guncase/shotguncombat,
+/obj/item/ammo_box/magazine/m4a3{
+	layer = 3;
+	pixel_y = -5;
+	pixel_x = -2
+	},
+/obj/item/ammo_box/magazine/vp70{
+	layer = 3
+	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
 "LQ" = (