From 03ec953a60aea03e122fff237474baeded7bb5c8 Mon Sep 17 00:00:00 2001
From: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Date: Fri, 23 Sep 2022 05:50:16 +0200
Subject: [PATCH] Unhardcodes mech ammo empty sprites (#70056)

* Does some code for improving mecha ammo sprites, de-hardcoding it for downstreams, and adds a var to delete itself when empty instead.
---
 .../mecha/equipment/weapons/mecha_ammo.dm      |   4 +++-
 code/modules/vehicles/mecha/mecha_defense.dm   |   3 +++
 icons/mecha/mecha_ammo.dmi                     | Bin 874 -> 1138 bytes
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
index c939549c928..9dc8ab40867 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
@@ -10,6 +10,8 @@
 	var/direct_load //For weapons where we re-load the weapon itself rather than adding to the ammo storage.
 	var/load_audio = 'sound/weapons/gun/general/mag_bullet_insert.ogg'
 	var/ammo_type
+	/// whether to qdel this mecha_ammo when it becomes empty
+	var/qdel_on_empty = FALSE
 
 /obj/item/mecha_ammo/update_name()
 	. = ..()
@@ -20,7 +22,7 @@
 	desc = rounds ? initial(desc) : "An exosuit ammuniton box that has since been emptied. It can be safely folded for recycling."
 
 /obj/item/mecha_ammo/update_icon_state()
-	icon_state = rounds ? initial(icon_state) : "empty"
+	icon_state = rounds ? initial(icon_state) : "[initial(icon_state)]_e"
 	return ..()
 
 /obj/item/mecha_ammo/attack_self(mob/user)
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 8b859feb2c3..f4ab81b97d0 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -418,6 +418,9 @@
 			gun.projectiles_cache = gun.projectiles_cache + A.rounds
 		playsound(get_turf(user),A.load_audio,50,TRUE)
 		to_chat(user, span_notice("You add [A.rounds] [A.ammo_type][A.rounds > 1?"s":""] to the [gun.name]"))
+		if(A.qdel_on_empty)
+			qdel(A)
+			return TRUE
 		A.rounds = 0
 		A.set_custom_materials(list(/datum/material/iron=2000))
 		A.update_appearance()
diff --git a/icons/mecha/mecha_ammo.dmi b/icons/mecha/mecha_ammo.dmi
index 63bc38cfa71c706cde5466b2058661ff7ec54582..c7b92cfade5a94322108920a6d3cfff5aa5465f3 100644
GIT binary patch
delta 1111
zcmV-d1gQJ!2J#3YiBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`H>+kfB%^?
zKR-YJY5@P(06~Vd@9%tn006+iz{BQ`eYZJ@00001bW%=J06^y0W&i*Hy?RtwbVOxy
zV{&P5bZKvH004NLm6FQ}!Y~j;*U49eb}zoRZlp!Ju)k2!cG?7zR5GLD-y1AcH_~Kx
zFC5Mc%;e%+UaDFY*NQ*Dqn?~Ne~IH}%h^-+q(V9DIa8oVMRP%t1R-W%Z}iGI>$S(w
zcbpAgTA1@f89T->4Xjeyb>Mm}{rb=^8sW7XQ5$GlpMWNKRSFv6#ZD51Td9ds*a-7r
zB&t@r^@}ZJgtaqw3_C=5f7t)#T$FY3dD%B=n9YPwvUtn@00S6FL_t(|f1K@@Yj@iq
z42EO6#%@X0EocA#w+_r5ae1j{vk%f~o1BnWdH|tX+-_{jmWo}c7ezxooTW!S9M#{d
zdgb8?Jp(Yne*iH17)~!l{Ze}V_*>E3H~b8LSj%Pz>))+`dgmdEpS}t=4(eUxoS>>#
z9`^Ah{{4QB2uAcK?z*lKe*p#%ul%+t0KXR)K)mwXrU3k2i~$(EA_&<q1mN^*$c6w=
zIz<Hlt=~ieps5c4UY`S$^x6a2f;7GdXzSk-f+)TRDC?C6nuMEwr)?S08v_5%>$|12
ze+)r=^%&Mm>5`6<LbQzONg=WTqE;&H5}!Qo_vqup{Kj**V%&Y9e=wdnIBnb}NpXC+
zV%&UV=J@>Q0X8<iADG>k%x}#YfB~ih%sz(G3(@@N0l2^aw3f|qKri<nP*3`Mr_4MY
z)x-V0(LElI$it9cI=xKveFyQ%KcC8h-wO=jb6@vdFP$C+FnZ-7WCI4UM>q3#dixQ0
zKM(+ZuF8QZ05tUhf57W=fRaA+_hAdZl!qw32k7c0)yG><*601b@!;O=HgrFr*TCrW
zBt-lB>M=Z~AL#E%AsW0NAcctU2l#$~?+4h}oE=S)<9boF*^l*nKfnMCa2>$xV>rDK
z&3_(%`}<$kvKhkq-_}4q>F-_Si~!cF$kM(h1ZaP6<33}8e-Zs2S89epfB|GHuMpfP
z7(iHg6<+GU?vpV9As(;SE6Ii-0IieSLN<W+0{}o%9{^l@0#MS2{=UBjZN1+Dz5F%_
zQh>5P@9*nLi0N$-2%3awe_uU@px&kdJ%(_9PYTiC{QxOMd_TbV1AITg#^&s3k{s8I
zqRoD+=lcN$e_(*?0A?S<>4j+i|9iN<|6?tiVNd_v_@uwrk)?f&2zvTHK(D(^;->_N
z{y0Fq@_T#l_u^Ur6W%PsKL;qCA_^ca0R?F35rFbJrdwb(fNnuk4*-<)d4F#=LDD2_
z>-zv`fA7+O9K*IA06_bDQi!1Yfj+?5{eK_8*lGPgEeLR4|K9~Tz5hoD&h7vE1jqj0
d_r}>;_7_nqXx|-n-{1fM002ovPDHLkV1m^|8LR*R

delta 845
zcmV-T1G4<`2<iqQiBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3Xvf!e?f+{
z|CuvCKR<r}0RL(L|JVS)z`*bCe8c9Cs8NFA00001bW%=J06^y0W&i*HrFv9YbVOxy
zV{&P5bZKvH004NLjgZX>!Y~ko&&gAS_AdTiy+}*x!M=i|$+lTYQpv80Z*Q>R(RiB=
zJ_crLb#A+UP|c;64@iVdR3~-Ze{7|AqGgxiu$RIC&W=|g)(kmT5N`acq_CJM^G=E>
z=>Ti~T0YE02cv;#QKxcUKqB;T9n;^cgQ7}CGw1nk;i5ZvO>We&Jj?hy<<?(rt=gga
zy#EH^w{bBueJwu#00JmUL_t(&f$f*ua>F1DL}S{<q%^l_|NmQy5f=%he=*qRAuT&?
zGLtoXVhId6o&JO-LC57QR!0$}{KE)hz9kI608|2cPt)!TZT(TP-+yBju84Q|?v>qP
z^gp}`pU)2jluzGP=7;2*Am&?w^GW{sd`1N9L+(7!h)@T>mC@P)Vy(c(mC@P)Vy)T$
zFy0bUHwYm3bLvI{aI=&Fe=Os*k^#}r0sJ~(N<{O^64Cq!;PWk^Y_d-6W}B>2yHk@_
z9u@nisr;yzs9!9!%r6$22PkQ&hZ5}bV+}7C_{aBfgdZ+od=jwP_f2B`=?EXL=;`<0
z4~B+@hK624z4wE7?D+Izb}a83_b2&ZUh;VQo*%5%{E(az==kgPe~J=_Z-Q@F-{;;i
z0RXr%x0?-!wVHx&O5a33tBgg2PbdJ!+l15&2yp4}{e$m6A^>}L_xqi6qX0Z+8=z!B
z^fv)4;b{|4eo-RqH<So9`T3yJByTeKtxfJeP346)<$ku%GQU`8<M+Y%eK39>3=Itp
z{WJA`-p6Cdw->Wxe>wel6+2dSzB2y3+;d&Nau>7`Q2r8NFai6JPYHE^R2e(oEU)1c
z0N~0vJJzZV;KnaX-5>ynhnv_62>AlQc)~`2Yq9Z7;7bGrYAz9KGJHq5$)P}PO(xUG
zwOF2}G`|)gF0}0YUo5oR5=oDO%Jcs^0JQo1UkTWL{$B;`BR>Dv5cZw_*9m?1gV)wC
X59B;o?7uDa00000NkvXXu0mjf(rc5P