From 9a0f5df8ab6a435879309d62474bc7c1a596a036 Mon Sep 17 00:00:00 2001
From: Niezann <madarauchiha66612@gmail.com>
Date: Mon, 26 Aug 2024 04:40:47 -0700
Subject: [PATCH 1/2] dart gun fixs (+ sprites for darts)

---
 .../ammunition/calibers/special/dart.dm       |   8 +++++---
 icons/modules/projectiles/casings/slim.dmi    | Bin 1299 -> 1347 bytes
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/projectiles/ammunition/calibers/special/dart.dm b/code/modules/projectiles/ammunition/calibers/special/dart.dm
index a52d0c1939dc..118dac8ddb33 100644
--- a/code/modules/projectiles/ammunition/calibers/special/dart.dm
+++ b/code/modules/projectiles/ammunition/calibers/special/dart.dm
@@ -6,12 +6,13 @@
 /obj/item/ammo_casing/dart/chemdart
 	name = "chemical dart"
 	desc = "A casing containing a small hardened, hollow dart."
-	icon_state = "dartcasing"
+	icon_state = "dart"
 	caliber = /datum/ammo_caliber/dart
 	projectile_type = /obj/projectile/bullet/chemdart
 
 /obj/item/ammo_casing/dart/chemdart/small
 	name = "short chemical dart"
+	icon_state = "dartsmall"
 	desc = "A casing containing a small hardened, hollow dart."
 	projectile_type = /obj/projectile/bullet/chemdart/small
 
@@ -21,6 +22,7 @@
 	name = "dart cartridge"
 	desc = "A rack of hollow darts."
 
+	icon = 'icons/modules/projectiles/magazines/darts.dmi'
 	icon_state = "darts-5"
 	base_icon_state = "darts"
 	rendering_system = GUN_RENDERING_STATES
@@ -30,7 +32,7 @@
 	origin_tech = list(TECH_MATERIAL = 2)
 	magazine_type = MAGAZINE_TYPE_NORMAL
 	ammo_caliber = /datum/ammo_caliber/dart
-	ammo_type = /obj/item/ammo_casing/dart/chemdart
+	ammo_preload = /obj/item/ammo_casing/dart/chemdart
 	ammo_max = 5
 
 /obj/item/ammo_magazine/chemdart/small
@@ -43,7 +45,7 @@
 	rendering_count = 3
 
 	origin_tech = list(TECH_MATERIAL = 2)
-	ammo_type = /obj/item/ammo_casing/dart/chemdart/small
+	ammo_preload = /obj/item/ammo_casing/dart/chemdart/small
 	ammo_max = 3
 
 //* Projectiles *//
diff --git a/icons/modules/projectiles/casings/slim.dmi b/icons/modules/projectiles/casings/slim.dmi
index 034c040811df67ece8fd2fe345745b50a22418b1..6a88fe907a216b361f73de8362f2eb527714f34e 100644
GIT binary patch
delta 1252
zcmXw%e>l?#9LMMJtH;jp<S0Md_4M<JYq>B&D3a^Yosy@k=n+}d=2vWN`_d|rN_AS9
zGtZqPMXC$S*L;Vvb825dqqHC8wmo5noy~0f?$qV;-{<o@pV#~Id4E2)Y`SgAHkuv1
zu_*?KxqR`DzTVtNjeBx)d`~6@Pu4o2P$;wPpQ2+?A@Z@5<pj<<6rUZIoRySGNY5sa
zNhlPhvV53_Ilsf6KX-R`xcSa~!<{c)gnY$p-`i}>s|g=+qSDbAE2~UVUN6qX*jP44
zJomu$gqWx?o0=U_ql1+i&$U11eSK-75ZGk%C>Fu{;Q}utPnP!YN-hqY>Y}AY5-%1K
zjyD{d5%=f+)?7e$O{!mrlwr<sQys7E;uY1ER6lPqD`u{La&PlOs8a=(>D0o6w)qaX
zaS7PG>Xa=mBQ4*2{O*3>wtt6{;M?)6uEG9E=JCHvk3{*KtUFLuJ3GCejTE9#=0JO7
zSm+^2rSe^0=D44|<-u6o(QAQoH6Q$h6DA<bbISpc9qVpke@^IRQA{eSacWJ^GGF$D
zpI=+AwTatKn!Ty9V_fka|EJ(oAiL^~^7jFPO%beVwi=z})GBjaab6%l2Q01=sI@rs
zs(`X%0ISlJOb01kf^q2S8z8OA@|5$Kz!(JEp~rZh)q~P$%x0~rmTIh@cDTyQ-5oj+
z;SF|{Uy+<zfJ&WV2)X_P`R%6>K8LLvhIiyqCV}}tC-SUhDRRe8KxBqLtcp|r*=(43
zzhe)>-*7|z5#|=0VYJ+q1i9_|3peU=%$A#SeZRyo1H3O&u!x-c_D<*RB>1LWhqWJE
zw*r5?|LMKQ-RohMFGk=aRB41byAIQgR41cGHw7CIaIb=;@aG|mdesREW9>?p)K>j2
z-_pYwPl?o9L*YC%nBhmRQX5E(ov)@$Xuax^duoM5$w@#w^eQ0Eh4xV=GdR3bgIBQw
z2Vh(ivSEm=S%HO^w+h4_@y{lXdoNkPmE@a5kJWtwu%W#}uM)4zSLDJv+3e}~Mo5K#
z0#K|IWik9|XvZmdK@8wK5TzHadM&;+Vwj)(pn1-zmI;n|Db2pX6Uzrvf%3~4QDQ0m
z+sfepD1gDBP8)Oea#kGyjEXzh0O=8suI^jD(?*Zfb>y=hCeqvzPm8Tht;lOilzFfD
zLgJ=`w%xCwPh(%kmr2eZHAUS4JXEy1KFbaeTep(a$Cqx=P8w}8{74n^>4_6o_=nJK
zi3sXB-3?&8ueG)aRom->1A#`qh)8Q0l%5FzD<sC%3lT%3rpq}(Ttat5ip*+}ZSh5p
z@3MfYeVL_mOqz0UEOBkGG4^`#@LIP3H$RwajAXKV0u<B>2GUqzk51NODO9i0iN0U{
z5Sa%hZ1t<D1Y^YJfp&ywVh@7=V`YVX*yy^^cd#7cXfe7VL?aax6{R7E_33Sp1esUm
zyDtSH@-abC4CjgNN`udxj8NN-{ziugYIvzTCXJKu&}BX3S_M%Vt&bh%!Cu3nL1rM4
zdDsDQ)4h?Ol@U3PL?e6E|7!dZboW^f7JJ}*JQo)e(<e7UJ_)~Ut<ve{vhP0+fCA~p
zwlv1mE=6iOtsB3n8`mnZ!2m+h7L3kGEq=XfD&fv1?D)*$-$Bf89$tgDtK&cTREP|Z
K4tuyK@%(=c@rkDZ

delta 1204
zcmXYve^gQj6vv;nWYxfIsS6`I$E90Ic9x1IVe8;2XQZjQLQFeNQ)fWR&{TMuv(}uV
zGi54@YpJy}!~9v(dZtIPS-M3^`D36Mv`nA!GUD-TSl$2bJ?DPD_kQo~TT`~C<Wq;x
z(yd{jpwy-U0KkD8aX1p#r+t!WPX@B0j&W%T>8H|?IoxD63ji|3<%&DF-Yx5T7B|+O
zZ%Z#aig9yO$hggLZd!S09lq}MQvG*3c}c}Zp#mdPT2h$KPi7p6b+<a|7M~WD1*CR}
zi>{q7?i0u>9dn*95OPW!roTX<@nzuIhQEyg#ND&vww+Cb1>4MP(S2>WW;nvToqE0Z
zw@YsH-jGHoj&k+oCmnU1W?IGLtJDFB=Y0It?4Gdl?J38Z?c`nItsm1<0>inLQJei7
zU)((1bz(SpG8&Ov0Iv-MSH^ChCjhLx5<>ejDpNc+F_<<Uux?fO5vNCKGnYUw7rD{q
zLl`WppL`gFaiG<-7VN95zH+Uf^pa<{0?0|M%7WuH(~i<)o4PXzJV-71>9k^(Jkoa$
zeQIIk`ly;=QE&q`O_LJWZo-)|vnaM#9eK?w@1yb=lx+%>_0eY~4Hf~BwIxQq!C=@E
z<gI?wk@r=8Yv3;vwpb8BBcFQU*>F~#Oqj&W-(Co}pek9RQe_QoAkR50k6@2nN9}C`
z&VR=ljvrKAfauMv@g<X1gqT@=K{12y5b~k%*+OVlV~}RW@5ZMLK}PL?0UsrviM^F5
zJg73yQ*_2>W8ZFLFBBDyw>F%!V!m&~yaj`HHfcR6CAHSh(r}m>GYdBB)jAkg8+W3D
zYnd8W5%xgc-v6N*36!ldCcN!hp2*2N6egrHC)9p(M6>JC5G<SOPPmVBwL6lfHXkwM
z&Z|onbb<n-R1C!=FEr^y$N}GB*k3?n?}fUJqC@Pll>lJZUk)rqoNae`NchilViE`=
z8S)_?39(g=)<P!Ee2wakR@5gw*>1h7gKLS|x(um(-LLD8fj11su0_;IM}cBYHGgPD
z7u`C&1gn~C4+x6Q@5lh)|9MgLrB9SISn5b`$Q`6hqZ7%gU?*E}t_pV%{07sHc1fUd
zGDM-9_$~R`#Zj#ec2&ZB>&{@s<7|w3<GuH!p1o@y9UXaj$`&vC(achy87HkxIr@ZA
zy93h6E8X|b%!cU;mRzPe6TZ);dSqA@6C^>|S;FB9grrUEGc~H%NHEjF$deo1q}JaX
z$>sS$CeZ7Juz_uJo)gF2y(oGh!!D3lzn9A;y&xPqUZLMA8x3T*kTdC~vf)?MiS(Bo
zb<50>7nX&GnHA3Zu9FzNPUP-(%iCinV>|YSRs^e^>Aq4B@u{RCC~RRz!07uwQg7zp
zX8xNVWNHMdrUB`q5CcNgpwkFECK^;Ira+ru^w&5Iv6#=dz9v;ee?{kSBtKTW@5P_J
zEcxMPU)~%tc+{@aH%qo3(tp2zTuF?B#HzU_gU6W3D+Td4{Y>bOwt232w*tq|%NaL_
zL=ge=^4ZxxjZmkqdVT*c2x9Ii&(sN(k|5=04{a8{>LV=cLD&axn|fkVr^HFudNO6;
Q$Z{bh_%Q9p{`m9%0})tlaR2}S


From ba69b364bdce8ad48a86ff0fa807593769a03998 Mon Sep 17 00:00:00 2001
From: Niezann <madarauchiha66612@gmail.com>
Date: Mon, 26 Aug 2024 04:41:01 -0700
Subject: [PATCH 2/2] 5.7x28mm mag fix

---
 code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm b/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm
index 567dbf5fece8..ad7e3d669142 100644
--- a/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm
+++ b/code/modules/projectiles/ammunition/calibers/normal/a5_7mm.dm
@@ -33,6 +33,7 @@
 
 /obj/item/ammo_magazine/a5_7mm
 	ammo_caliber = /datum/ammo_caliber/a5_7mm
+	ammo_preload = /obj/item/ammo_casing/a5_7mm
 
 /obj/item/ammo_magazine/a5_7mm/nt_les
 	name = "magazine (5.7x28mm)"