From 255f742a6e9eba2a67821536edb0cd2697aea8af Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Fri, 6 Feb 2026 21:26:17 +0100
Subject: [PATCH] Fixes the francisca ammo ordering from operations (#21816)

It was set to give grau ammo. Simply a fix for that.
---
 code/modules/cargo/items/weaponry.dm | 18 ++++++++++++++++--
 html/changelogs/BetterGiveUsAmmo.yml |  6 ++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/BetterGiveUsAmmo.yml

diff --git a/code/modules/cargo/items/weaponry.dm b/code/modules/cargo/items/weaponry.dm
index 106a72f2c8b..fabf338776d 100644
--- a/code/modules/cargo/items/weaponry.dm
+++ b/code/modules/cargo/items/weaponry.dm
@@ -511,7 +511,7 @@
 	description = "A box of 40mm AP ammo for the francisca rotary cannon."
 	price = 850
 	items = list(
-		/obj/item/ship_ammunition/grauwolf_bundle/ap
+		/obj/item/ship_ammunition/francisca/ap
 	)
 	access = ACCESS_CARGO
 	container_type = "crate"
@@ -525,7 +525,21 @@
 	description = "A box of 40mm FMJ ammo for a Francisca-type rotary cannon."
 	price = 800
 	items = list(
-		/obj/item/ship_ammunition/grauwolf_bundle
+		/obj/item/ship_ammunition/francisca
+	)
+	access = ACCESS_CARGO
+	container_type = "crate"
+	groupable = TRUE
+	spawn_amount = 1
+
+/singleton/cargo_item/franciscafmjammo
+	category = "weaponry"
+	name = "francisca rotary cannon fragmentation ammunition box"
+	supplier = "zavodskoi"
+	description = "A box of 40mm fragmentation ammo for a Francisca-type rotary cannon."
+	price = 800
+	items = list(
+		/obj/item/ship_ammunition/francisca/frag
 	)
 	access = ACCESS_CARGO
 	container_type = "crate"
diff --git a/html/changelogs/BetterGiveUsAmmo.yml b/html/changelogs/BetterGiveUsAmmo.yml
new file mode 100644
index 00000000000..7ec8b29da64
--- /dev/null
+++ b/html/changelogs/BetterGiveUsAmmo.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes the francisca being incorrect."