From d7b4381f124549cdae4e29f8dd67a6e94c232e0f Mon Sep 17 00:00:00 2001
From: Waseemq1235 <42235601+Waseemq1235@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:26:32 +0200
Subject: [PATCH] Adds HEAP for the F903 [ADMIN-SPAWN ONLY] (#4389)

# About the pull request

Adds HEAP magazines to the TWE. They are admin-spawned. Does NOT spawn
with the ERT
Tested locally.

# Explain why it's good for the game

Why the hell does the TWE not have HEAP?


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Added HEAP F903 magazines. Does NOT spawn with the ERT presets.
ADMIN SPAWN ONLY.
imageadd: Added F903 ammo band icons.
/:cl:
---
 code/modules/projectiles/magazines/rifles.dm  |  20 ++++++++++++++++--
 .../weapons/guns/ammo_by_faction/twe_ammo.dmi | Bin 399 -> 485 bytes
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm
index 42c79fdab858..3d1b7088fa83 100644
--- a/code/modules/projectiles/magazines/rifles.dm
+++ b/code/modules/projectiles/magazines/rifles.dm
@@ -471,8 +471,8 @@
 	default_ammo = /datum/ammo/bullet/rifle
 	max_rounds = 30
 	gun_type = /obj/item/weapon/gun/rifle/rmc_f90
-	ammo_band_icon = "+m41a_band"
-	ammo_band_icon_empty = "+m41a_band_e"
+	ammo_band_icon = "+aug_band"
+	ammo_band_icon_empty = "+aug_band_e"
 
 /obj/item/ammo_magazine/rifle/rmc_f90/marksman
 	name = "\improper F903A1 Marksman magazine (10x24mm)"
@@ -483,3 +483,19 @@
 	gun_type = /obj/item/weapon/gun/rifle/rmc_f90/scope
 	max_rounds = 20
 	ammo_band_color = AMMO_BAND_COLOR_AP
+	ammo_band_icon = "+aug_dmr_band"
+	ammo_band_icon_empty = "+aug_dmr_band_e"
+
+/obj/item/ammo_magazine/rifle/rmc_f90/heap
+	name = "\improper F903 HEAP magazine (10x24mm)"
+	desc = "A 10mm armor piercing high explosive assault rifle magazine used by the royal marines."
+	default_ammo = /datum/ammo/bullet/rifle/heap
+	ammo_band_color = AMMO_BAND_COLOR_HEAP
+
+/obj/item/ammo_magazine/rifle/rmc_f90/marksman/heap
+	name = "\improper F903A1 Marksman magazine (10x24mm)"
+	desc = "A 10mm armor piercing high explosive assault rifle magazine used by the royal marines."
+	icon_state = "aug_dmr"
+	item_state = "aug_dmr"
+	default_ammo = /datum/ammo/bullet/rifle/heap
+	ammo_band_color = AMMO_BAND_COLOR_HEAP
diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi
index 2e8a3d18724d5bd7043b5925fb047aeafe82c3ee..6d7b49c17612de973f227ae5092763ab6318e933 100644
GIT binary patch
delta 367
zcmV-#0g(QW1LXrHiBL{Q4GJ0x0000DNk~Le0001B0001B1Oos701&on3jhEBDv>23
zA;-tZ*4Ea*z`)DP%imhX3;+NC0d!JMQvg8b*k%9#0F04bV}Deo4N{hrn3qDlN+L`J
zDNV^OB32!-?gS|%-mNgzxJ_49aP@NmM*sk{rf^wOzk)LW007ZRL_t(oh3%EG4Z=VS
zMST=0prK%a91;VB;uc_lOpyVu;d&$zCP0~mS=fc7v>p9Zf>MC|x>wlWr;}_V<Ck&e
z9=c*v9cu2G0)KZrHOLi3=pu4GQtDgedZciR$ceTx;n^Z5+RaT61uG=XeuF4jkkH?e
zE1c&)D}4fAVmAz9HI|%<OU*ocE~=&ht|&rcTSK}YDLvSIkUqjTn+xe2fse55JaoLa
zz*WJL1h!kHPradwz*WJ}k?mILI>CEFZWxB~7rZmBcpPQ?`vk-IKR&_0Mj4qDf!Y87
N002ovPDHLkV1kXImjwU-

delta 280
zcmaFL+|R7q8Q|y6%O%Cdz`(%k>ERLtq#Zz*g&9ajxaYhDQgRbjl|+ThC3%5t#*!ev
zU<QY0H`0Kd(uo<#^-Hx>w|7L8?(hu>EBIQ>Sk1;zC~LiR>%)xsKo#>mT^vI^I^SL~
z<Z3YxV7<`Uy0ul@pozVJTmJ#0jVs@TV_%vs3U_S3>uIT6<Fk3gg!{H9mT>%Z4w)o;
z+4Mq4?^~s{d^73_PK5ZkyD!taBRKQSmdccQJCr`{zf<u3M9P{P%fQ^ew;Q~@j6S8=
zp6ULOY}<2=@v{}jBk}BFUcZg}TXuRpeB5~Xh*V?zU4>mM=Bn}W&rx#`-@5b6v<cpI
a6ZKt;9Og2w+V~gfR0dC1KbLh*2~7aVifl9h