From ff8a6251b97c9dece6a0444129d08d53b444fb70 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 17 Jul 2023 23:23:41 -0400
Subject: [PATCH 01/25] Add framework for new ammo types and

---
 .../icons/obj/ammunition/22lr/tier0.dmi       | Bin 0 -> 471 bytes
 .../icons/obj/ammunition/22lr/tier1.dmi       | Bin 0 -> 480 bytes
 .../icons/obj/ammunition/magazines.dmi        | Bin 0 -> 906 bytes
 .../projectiles/ammunition/22_LR/bullets.dm   |  35 ++++++++++
 .../projectiles/ammunition/22_LR/magazines.dm |  66 ++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 mods/persistence/icons/obj/ammunition/22lr/tier0.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/22lr/tier1.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/magazines.dmi
 create mode 100644 mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm
 create mode 100644 mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm

diff --git a/mods/persistence/icons/obj/ammunition/22lr/tier0.dmi b/mods/persistence/icons/obj/ammunition/22lr/tier0.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e595194c65b0631ee2da8387db960876d241f57b
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq004jh003YF0{{R3Csb#80000gP)t-sz`(#g
zIW&}zg=S_}hK-TL#Ke@8l-AbPCnq1kz`$}kD9L6)j7%<AC?b>WJE{Nx00DGTPE!Ct
z=GbNc004)2R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM
z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+Gp{T)uOz>yQi+Q*C9|j)C}zmTnO2mT
zn+jpWRhH)$<)k1~S>REnn^c;UlUhR1NVw$$G$<>$`niC;2LJ{3LxK;OEUN$j0LV#1
zK~z|U?ba<0!axuO;N4Jm6A}^%2FcF}8VnKz7FW9tivViNP0;NXH~|XHY0&dZwrsW}
zi1)cS9bU#QN)b_~^enPqy!3xh_Ar2~7uiS*dMmkLjxyU59*~x@G4&S|POi_hsS08s
zPp;*sweRV5-0zi&Jb;LZsAK)WeT#z~Jl{EFeBKX`l__N2I)8yV;|UH2QsXbq#=lQQ
zMD$~W>K0c}-=C2eJX#9yxo)WZ1@?lI8uHNJpF5nq+D?*^uyrE(KX2!$7OO*riv<7x
N002ovPDHLkV1mZv$b0|*

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi b/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..36b1785daad869641393279cdec5bacf2ac2f461
GIT binary patch
literal 480
zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!VDzUL(;2&lx~1ei0gp^2kISFvW+D^E_OMY
z<`|)&v?`h5$Bl$L3#8k6CmuO+WXhB&*REYFFk%3zoOw-E3aF8>B*-tA!Qt7BG$5z7
zDkP%BCAB!YD6^m>Ge3`kp<+&OSV2+g_b<T(AHP1)^48TlcjkQXhERix#t$CpocGZ@
z$xzhOyTigb$oR6cm%^M!la5RZQ3%#FUaw=iUS<D^AoG<b>grovI=hWkH?NS;NIh|M
zX4sS&v$+zJvlLcrve~bp&bsgvQ@<9|G;Qr2zjik4WoO8dcWz?(bnp$(K^Ht-977^n
zlM^IZ7bjFOx;e6*;t??8TyTN4PlIiP=!Bdmg)YWNqCY~5^$rLmxfV7QMl*HkR9mjf
zddK`j*F#@$cZ1S_i;j~Rb5e5`{m4~dF<KX^u!dv3aFyoe^9LLjGP@nr02wXP!{l|4
zDMU|v<*!P=MW3F_I6PhN_&7P_eY)8KO^fDJ^LzFB^BBx`O*UJ=y?{x_cTS)I7fh=H
zvs_6dvx?LPc3<Z6nI)p<e(*l9Ydsa;9Jsezpx_Woh@Lv*Q;-!+j_eGg@8xC}%fze%
P`i;TU)z4*}Q$iB}-(k2h

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1357749bcf0ae2b729112e2d378f764fb7bfb251
GIT binary patch
literal 906
zcmV;519kj~P)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu00015P)t-sz`(#X
zI6XZ%G>l9xIXqdaV*qAmR>@{T+@Kry*kCO&JXKj^FDXD)Tyc|>n~jyBl#qq1l3~`r
zlG&nyg^84}yT*5dm~dY`MLsd!wmn!VB63A4xP&l5CL_q;KC=J-00DGTPE!Ct=GbNc
z005JER9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;Zh
zDainGjE%TBGg33tGfE(w;*!LYR3KBy$S9}CK#7YpC9|j)$T#HTOe;#vO@**gRq2`%
zsg5}F42e^vYeA$s!nP*mSHu(RLWEi)5)>1yk`(6}lHvrMp{lIl>gNJZA^_v*m3-}=
zdzt_M0zXMaK~!jg?U~(nf-n$-MG&zD75bA{?EAlFvw_xLusdy54?XS9?RT;>ng|T8
zRwk3l^s7{?qslU$gZb4aNeEEXb-mrP4w!=gRns)P9iQN#Ann;PTJ9=RTk!$*hr?li
z;0=`Awa4SJJxT#cl7Wu9mLvu^0RzMf5TFqQ6ovc&v^;J<`T`c;fyD#Z5m<T$77y^>
zk3dK2`46b%ZcBO;0z8qPc>^VPFQjK7fKMO6KirACGJOT5V*`BXPTYNn3t%#tOr}30
z?{!@5A8&|~g~(BV=kMiT=Xa8Y%u#=@V1jXeRLJ6}zr%k2Ip5D4AddPw;@A1}28hEa
zcfiAS{;UDw_{rV1mB51s{($2rcbWSxj26s%zdnh4rQ8AX4-|p-uTuoxUlm~T4_%P_
z>ovzGgX|;V`+oHIVcx&*M}LMVX^ueLT#7)yFYX6O5m=t2+X3o@J-fe%-zI=?z7U@b
z@~;9RNEbNFNxG{*vXJH@j{7_8_dz&c-{Gjg!+x(7>hG}Ms{?@kZvEb5GMWC5P=6Qx
zJ--P@{XX6k#SvPL`u%iIW=Ci_>i4w%Oe0?J!%=@v>uEqaKS0Y-f4{DuAE4!^zYl3~
zT0c8L%Ta$HF6Z-<e}2A_qyA3)H;v%dZ+3%<gZ@5(7~#UsZ<0kW2mL+yM|HzRnBQ!&
zIq2^`HQVU#hYPcQoS(^IfA?d#j(m7yInB@HKj`;peI8f$d-eMPZNI<4`vGmg*S{Z7
g_j@fjnM}**9lI%P5|@fiz5oCK07*qoM6N<$f(AXXlK=n!

literal 0
HcmV?d00001

diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm
new file mode 100644
index 00000000000..9798f4ce8a9
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm
@@ -0,0 +1,35 @@
+#define CALIBER_22LR ".22LR"
+
+/obj/item/ammo_casing/twentytwolr
+	name = "generic .22LR round"
+	desc = "An unsettlingly generic .22LR round."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi'
+	caliber = CALIBER_22LR
+	projectile_type = /obj/item/projectile/bullet/twentytwolr
+
+/obj/item/projectile/bullet/twentytwolr
+	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
+	damage = 10
+	distance_falloff = 1
+
+/obj/item/ammo_casing/twentytwolr/handmade
+	name = "makeshift .22LR round"
+	desc = ".22 Long Rifle round of dubious origin. Struggles at medium-long range and against armor due to shoddy construction."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier0.dmi'
+	projectile_type = /obj/item/projectile/bullet/twentytwolr/handmade
+
+/obj/item/projectile/bullet/twentytwolr/handmade
+	damage = 15
+	distance_falloff = 6
+	penetration_modifier = 1.5
+
+/obj/item/ammo_casing/twentytwolr/simple
+	name = "standard .22LR round"
+	desc = ".22 Long Rifle round of ancient design. Servicable, but struggles against armored targets due to unimpressive stopping power."
+	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi'
+	projectile_type = /obj/item/projectile/bullet/twentytwolr/simple
+
+/obj/item/projectile/bullet/twentytwolr/simple
+	damage = 25
+	distance_falloff = 4
+	penetration_modifier = 1.2
\ No newline at end of file
diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm
new file mode 100644
index 00000000000..81422fee461
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm
@@ -0,0 +1,66 @@
+/obj/item/ammo_magazine/twentytwolr
+	name = "generic .22LR magazine"
+	desc = "An unsettlingly generic .22LR magazine."
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	icon_state = "22lr1"
+	mag_type = MAGAZINE
+	caliber = CALIBER_22LR
+	material = /decl/material/solid/metal/steel
+	ammo_type = /obj/item/ammo_casing/twentytwolr
+	initial_ammo = 0
+	max_ammo = 0
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/box/twentytwolr
+	name = "packet of generic .22LR rounds"
+	desc = "A packet of unsettlingly generic .22LR rounds."
+	icon_state = "box_22lr1"
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	material = /decl/material/solid/metal/steel
+	caliber = CALIBER_22LR
+	ammo_type = /obj/item/ammo_casing/twentytwolr
+	max_ammo = 20
+
+/obj/item/ammo_magazine/twentytwolr/handmade
+	name = "makeshift .22LR magazine"
+	desc = ".22LR magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship."
+	icon_state = "22lr0"
+	origin_tech = "{'combat':1}"
+	material = /decl/material/solid/plastic
+	ammo_type = /obj/item/ammo_casing/twentytwolr/handmade
+	max_ammo = 5
+
+/obj/item/ammo_magazine/box/twentytwolr/handmade
+	name = "packet of makeshift .22LR rounds"
+	desc = "Container of dubious origin intended for holding loose .22LR rounds."
+	icon_state = "box_22lr0"
+	origin_tech = "{'combat':1,'materials':1}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/handmade
+
+/obj/item/ammo_magazine/twentytwolr/simple
+	name = "standard .22LR magazine"
+	desc = ".22LR magazine of ancient design. Servicable capacity, but outpaced by more modern designs."
+	icon_state = "22lr1"
+	origin_tech = "{'combat':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
+	max_ammo = 8
+
+/obj/item/ammo_magazine/box/twentytwolr/simple
+	name = "packet of standard .22LR rounds"
+	desc = "Container of ancient design intended for holding loose .22LR rounds."
+	icon_state = "box_22lr1"
+	origin_tech = "{'combat':2,'materials':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
\ No newline at end of file

From efe905c10d2fe13c016aa5366744e7c30a30b441 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 17 Jul 2023 23:25:18 -0400
Subject: [PATCH 02/25] Update _persistence.dme

---
 mods/persistence/_persistence.dme | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index e864e0ac0c9..01879e42051 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -32,11 +32,11 @@
 #include "controllers\subsystems\processing\specifications.dm"
 #include "datums\extensions\extensions.dm"
 #include "datums\extensions\holster.dm"
-#include "datums\inventory_slots\_inventory_slot.dm"
 #include "datums\extensions\label.dm"
 #include "datums\extensions\lockable.dm"
 #include "datums\extensions\assembly\assembly.dm"
 #include "datums\extensions\eye\area_control.dm"
+#include "datums\inventory_slots\_inventory_slot.dm"
 #include "datums\mind\mind.dm"
 #include "datums\music_tracks\blood_loss.dm"
 #include "datums\music_tracks\juno.dm"
@@ -221,6 +221,8 @@
 #include "modules\power\fuel_assembly\fuel_assembly.dm"
 #include "modules\power\fusion\fuel_injector.dm"
 #include "modules\projectiles\ammunition.dm"
+#include "modules\projectiles\ammunition\22_LR\bullets.dm"
+#include "modules\projectiles\ammunition\22_LR\magazines.dm"
 #include "modules\projectiles\guns\projectile.dm"
 #include "modules\projectiles\guns\energy\tier0\lasrifle.dm"
 #include "modules\projectiles\guns\energy\tier1\laspistol.dm"

From ddfabb64767175ef5c503bfaef53abff03846d4c Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:09:54 -0400
Subject: [PATCH 03/25] add DMI files for 2 new guns

---
 mods/persistence/icons/obj/guns/tier0/pistol.dmi  | Bin 0 -> 891 bytes
 .../icons/obj/guns/tier1/pistol_pocket.dmi        | Bin 0 -> 880 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 mods/persistence/icons/obj/guns/tier0/pistol.dmi
 create mode 100644 mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi

diff --git a/mods/persistence/icons/obj/guns/tier0/pistol.dmi b/mods/persistence/icons/obj/guns/tier0/pistol.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..70972215a759300ce2969f965a06e98e243fc9a1
GIT binary patch
literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0001WP)t-sz`(#T
zHAYZXWR8!RyT!+mR5NciGQxQ}H9mWMwAnv-!3+!x6ciKy001I7XdjZoIAn`DA_juO
z*ucQRCmazqCmkso5?@9;Pc$ZFL^e)5FCifwM>Z@rCLBmKCo35hMMOZ5kdQ7dEUc`o
zDJLdDK|d`mD{h>`ZvX%Q0d!JMQvg8b*k%9#0Hk_USad{Xb7OL8aCB*JZU6vyoKseC
za&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AXBM4
zzbGd~H&uy?GbOXA7${=M#hF%=n41b=!_{S!<|gLlXQn75<)>7}7w6=c=oaZ_B<7_c
zbea&YGlw{xV7HOxGF_1Q@kyyUB?L{+&qGs(YQD09tDg%vNC7o@XIGoE4-5bR0t87!
zK~#90?V9Ow!Y~Yk;~bPiTaJMq6dFp8_kYAH$0R0L0p(I@_xllMJh69UJ7%QF^8f$<
z9ASLIs7U+SH6VNy{Y+MA22$A!L(tE#`hf`x5(8nFu0%MP0pA1_(kTfBGeApVDx8|^
z-9ky=*o40L)!^=D+KWeb8z6lX$qaCgx%SabG$MEI1xWQHnFDUlnD#O0vj;$;Pd_pP
zhEa02k8dZFF*_FN%ijokliZ!04#+^AesYoOd&$gQ>Wnr3Z=l6rgUf-_85y80I3TAE
zMuX}D00000000<70Z6-ifwQ+L1yH?N=Eo_OhrpK+RU%AbI>!~Cic%0!bnHNyKdJin
zgwLO53al|?ol{O6$Ws7Tl-(eIP>s>$DF7?VZje8y#^_B`0O=Tw^9MsFA^`vZ002N2
zs1z00`Z{F|IpvpSlV66_x9SVB5)Z}tf@}tUV|_tqaG&?j)E9K8&&=zY`hpJix&2*R
zUyw7s>p-6wyr?fQHDyNk)Bf~}`hthqY|eCFOxqgZ6Afj3!F;)#G0W820H0{E>I>)y
zV%MOhftthKsxRnu5Ac-r1^u2v000000N2TCy;jwKe0qLSb+FpJZnmlhcH7;XrU5UG
zW8F>QdHYz|z#pT1kl&IX1H6k^{CflHOQ3JydfC4pK0d!x9UKndn)={c`2iq@3tcF0
RBE$dy002ovPDHLkV1k!reWU;Y

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi b/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a128bf8e03ed551eddf03ccbae82d45862414fda
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0001TP)t-sz`(#T
zHAYZXWR8!RyT!-F$;luiEkY(EkyImZH6X%yFgG?rAR;HhDL)Jh3=|X;0000wA_l;~
zz$Y9LH76Y@8WLYdJ5MwwWkfbkJTD<39!EATHYOZMG$$(=6-7iqkdTlrEiA08tSKiZ
zK|wz)Ei2k)!h`?-00DGTPE!Ct=GbNc005nOR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`
z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSJijO>
zMTv_uC9|j)$T#HTOe;#vO@**gRq3V@RF_ejo0ylMnWB)CpHit?oReP?UlgB_n1^J8
z3DG)p$kv&Zno~khUw$5%I#fR?E4cc(fP)kO=W=JezqS_V00065Nkl<Zc%1E+i*kZ6
z6hxDNBmuN_v=6JbwU7V*#U>z?po9ctQ`<d`4tnA4B7vE^ga81*uYuCTHlsepFt9|y
z_HX@pTx>S#U4k1(70F~WsWwuU9v8DLYl@1{`bqUt(CQ>9vlbN>F|bD~W!9o1uz@V2
zZOs1GVjwsdQgW`(^W^y%^$X||B85h4)04N^K>hriLgu-UTsO~7t}lB%Nqrr3_m{a4
zx#UC(oYuG1m3|@o40Ijq|5x&?cX?auEM<kdM9$)}KF0VduLSxJvDMW*T9#^&xEoLo
zN|v-7oTX0^RupA@Uak&ESrqN3y%L}U2CVgI=`OyfoVLGl^>`Eg{VRs*XF@5ztN;K2
z00000;Cir(**+8a=)Ax(=qDb*ShtP4pQ6`+PX-}6Z9KfoqBFQR=nTMFUzly`ZHMVu
z?^2qB`*)8j18_AUjW+t&IusZ*po0T*aBtXW0B&^J)W<r<2j<{@z%v6d+Kk8#00000
z0000WE`c(F@z^qgA8}yI2%Km1bFgIumLYd`6Ux9qM$qTsb{5QlH6!Rt8s@WL2F7Is
zAq|Wpx`A+O00000004NgST3XL-`zhvMs=`QJ+0PJ4Q$q%=a>e_cDs$c2nc!EMmF%r
z2sh-9B=&$e|Mv!>UxN4su9uhB-P`*|R0q4=XH0!?t$YEB4iM>@cjM*&0000<MNUMn
GLSTYOw0aEy

literal 0
HcmV?d00001


From a7460bdc16b5d0290a38ac2b8a401f360937d2fc Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:40:16 -0400
Subject: [PATCH 04/25] Add 'Zip' and 'Rimfire' pistols

---
 mods/persistence/_persistence.dme             |   4 ++--
 .../icons/obj/guns/tier1/pistol_pocket.dmi    | Bin 880 -> 875 bytes
 .../guns/projectile/tier0/pistol.dm           |  21 +++++++++++++++++
 .../guns/projectile/tier0/revolver.dm         |   4 ++--
 .../guns/projectile/tier1/pistol.dm           |   4 ++--
 .../guns/projectile/tier1/pistol_pocket.dm    |  22 ++++++++++++++++++
 6 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm
 create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index cf680d217d8..1bd87738b04 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -132,8 +132,8 @@
 #include "modules\fabrication\_fabricator.dm"
 #include "modules\fabrication\fabricator_build.dm"
 #include "modules\fabrication\fabricator_intake.dm"
-#include "modules\fabrication\designs\textile\space.dm"
 #include "modules\fabrication\designs\protolathe\designs_weapons.dm"
+#include "modules\fabrication\designs\textile\space.dm"
 #include "modules\hydroponics\grown.dm"
 #include "modules\hydroponics\grown_indedible.dm"
 #include "modules\hydroponics\seed_machines.dm"
@@ -222,6 +222,7 @@
 #include "modules\power\fuel_assembly\fuel_assembly.dm"
 #include "modules\power\fusion\fuel_injector.dm"
 #include "modules\projectiles\ammunition.dm"
+#include "modules\projectiles\overrides.dm"
 #include "modules\projectiles\ammunition\22_LR\bullets.dm"
 #include "modules\projectiles\ammunition\22_LR\magazines.dm"
 #include "modules\projectiles\guns\projectile.dm"
@@ -237,7 +238,6 @@
 #include "modules\projectiles\guns\projectile\tier1\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm"
-#include "modules\projectiles\overrides.dm"
 #include "modules\reagents\Chemistry-Holder.dm"
 #include "modules\reagents\chems\chems.dm"
 #include "modules\reagents\chems\recipes.dm"
diff --git a/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi b/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi
index a128bf8e03ed551eddf03ccbae82d45862414fda..4d8651036069c5f931b378c6a4d6d1e09532ee49 100644
GIT binary patch
delta 544
zcmV+*0^j}c2I~f}R{?(k{z*hZRCt{2n2U0PFcd_SfO!DgI@*WT(%Q%W|6&u63J4)!
zY-+p5(Lpb{yJ&FcE+GH_@N1y-c+BXSq90hKVTY%AJuOxT<tg3`#F}U}n-vE!i%*N3
z^Qx%vtsfN+4J|H`GHX$D5d#N|61NsLo(*tL>oogYi=GfdDkXn}xz5h(Yt%2GPl%ER
zqfI++vw`~gH-$<Psf20HJNK8p9>rrFw9i+Gl!+3=2z2Y)>RLaQ;|#PNo9|Z%-n+f6
zbr!Q!|3uE>s$A3fC@BQ`m)Pq19?denN!$%+2N{cM4$jgi5ld52UYDx_lBH?=-(CyQ
z0Rz_h1hRSkozQ=OZ*rjjQ2k6O6_*tN00000003MMmN9$G1U@-0unhXqh+wSU#@$ca
z>tIX<AzN)mcvop_aIY{KfU~}AwkeMtre||X)*RfwdlVUfs{z$$W7d|Tz@PyW95e^_
z3X=gi8!%F}HsxC9_@FtsADKJr`&|nF00000002Solo5YS$CeTNhyz<j;5?(BgDoSl
z47rONUj_y;f<6zo3vULj89`stuv~aEFfAkSX<!<`4fxvw000000ALiW^*X5j-TlL3
zPzS5c(`Fmgz;3&H4rzeoc^-BX5b}}-Ht@&rH{?$w^nkbg_XdLh1mO)_FE6kAxA%{r
i4)*)ckop+lTKNKaPY|EB(eiQt0000<MNUMnLSTZ;5cWa<

delta 549
zcmV+=0^0rS2Ji;3R{?(l14%?dRCt{2n2U0PFcd_SfFuF5b+iwwwY87`|HURCm7s(K
zV^iBbjt+X^?jnJiyMzD$z^{SQ!#1Nn#W1i$!S-+cd0cEZ>Ro~xNEOLsGO0FFmL3<g
zENhC2(E3UBQqbxoDYF(87csC$D`nQABCvrhqixLo)?y$y7gB$6uFv!2`5E;K=o2D^
zMr+fPx7k4b{F_4NxsY5p&rYr{dp${g9d!4Xxe&SJL<^kOx7C$?A^Z$<9qa#B@~n4x
zTk9-kg}Ow};<7%*_$jXh`VX<y)je94YLU1bP!39#v>cqJPZCxXWqn?*4oF!P?WesG
zpaTZ1^=auYzNdejw!d-pcoY5oD~9T4LMgwj000000002sda#VyJ`?!pyudQ(Cmz9A
zw~f1>qSt{>1|d3aJiN=IGq^YC48U1mm~HB9hv`}GQksMNcaJIqa5W%}Hu~5)6c{w1
zg9CGLZ`fx5Zgkqz$2!Lc=HPz7GXpT%jK~iF00000004g=E`c(F@z^qgA8}yI2%Km1
zbFgIumLYd`6Ux9qM$qTsb{5QlH6!Rt8s@WL2F7IsAq|Wpx`A+O00000004NgST3XL
z-`zhvMs=`QJ+0PJ4Q$q%=a>e_cDs$c2nc!EMmF%r2sh-9B=&$e|Mv!>UxN4su9uhB
n-P`*|R0kcq-DgaFaIJg+iVhIzns?*o00000NkvXXu0mjfbUXmV

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm
new file mode 100644
index 00000000000..e9e9f27af80
--- /dev/null
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm
@@ -0,0 +1,21 @@
+/obj/item/gun/projectile/pistol/handmade
+	name = ".22LR 'Zip' HG"
+	desc = "Pistol of dubious origin. Struggles against armored targets, but carries the benefits of magazines over hand-loading. Chambered in .22LR."
+	icon = 'mods/persistence/icons/obj/guns/tier0/pistol.dmi'
+	fire_delay = 8
+	force = 5
+	accuracy = 0
+	one_hand_penalty = 2
+	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
+	caliber = CALIBER_22LR
+	ammo_indicator = FALSE
+	w_class = ITEM_SIZE_NORMAL
+	magazine_type = /obj/item/ammo_magazine/twentytwolr/handmade
+	allowed_magazines = /obj/item/ammo_magazine/twentytwolr
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT
+	)
+
+/obj/item/gun/projectile/pistol/handmade/empty
+	starts_loaded = FALSE
\ No newline at end of file
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
index 028176b03c7..4bb5394164f 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
@@ -1,6 +1,6 @@
 /obj/item/gun/projectile/revolver/handmade
-	name = "10mm 'Underdog' RV"
-	desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in 10mm."
+	name = ".45 'Underdog' RV"
+	desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in .45."
 	icon = 'mods/persistence/icons/obj/guns/tier0/revolver.dmi'
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
 	caliber = CALIBER_PISTOL
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
index 517db03dcd5..c675c6462a4 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
@@ -1,6 +1,6 @@
 /obj/item/gun/projectile/pistol/simple
-	name = "10mm 'Colt' HG"
-	desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm."
+	name = ".45 'Colt' HG"
+	desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in .45."
 	icon = 'mods/persistence/icons/obj/guns/tier1/pistol.dmi'
 	fire_delay = 5
 	force = 5
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm
new file mode 100644
index 00000000000..ac81de075e4
--- /dev/null
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm
@@ -0,0 +1,22 @@
+/obj/item/gun/projectile/pistol_pocket/simple
+	name = ".22LR 'Rimfire' HG"
+	desc = "Pistol of ancient design. Small enough to store in pockets, but struggles in combat due to weak caliber. Chambered in .22LR."
+	icon = 'mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi'
+	fire_delay = 3
+	force = 5
+	accuracy = 1
+	one_hand_penalty = 0
+	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
+	caliber = CALIBER_22LR
+	ammo_indicator = FALSE
+	w_class = ITEM_SIZE_SMALL
+	magazine_type = /obj/item/ammo_magazine/twentytwolr/simple
+	allowed_magazines = /obj/item/ammo_magazine/twentytwolr
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE
+	)
+
+/obj/item/gun/projectile/pistol/simple/empty
+	starts_loaded = FALSE
\ No newline at end of file

From c94588bd3bcec233720083b55b0837d10f298fd5 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:40:49 -0400
Subject: [PATCH 05/25] oops

---
 mods/persistence/_persistence.dme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index 1bd87738b04..2d332640d32 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -230,11 +230,13 @@
 #include "modules\projectiles\guns\energy\tier1\laspistol.dm"
 #include "modules\projectiles\guns\energy\tier1\lasrifle.dm"
 #include "modules\projectiles\guns\projectile\tier0\boltaction.dm"
+#include "modules\projectiles\guns\projectile\tier0\pistol.dm"
 #include "modules\projectiles\guns\projectile\tier0\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier0\shotgun.dm"
 #include "modules\projectiles\guns\projectile\tier1\boltaction.dm"
 #include "modules\projectiles\guns\projectile\tier1\pistol.dm"
 #include "modules\projectiles\guns\projectile\tier1\pistol_gold.dm"
+#include "modules\projectiles\guns\projectile\tier1\pistol_pocket.dm"
 #include "modules\projectiles\guns\projectile\tier1\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm"

From 007a318ae584d91ecfab5e40c7866c45a7a81e0f Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:49:07 -0400
Subject: [PATCH 06/25] Adds new guns to protolathe

---
 .../fabrication/designs/protolathe/designs_weapons.dm       | 6 ++++++
 .../projectiles/guns/projectile/tier1/pistol_pocket.dm      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
index f426b92c8cf..64771ea008d 100644
--- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
+++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm
@@ -4,6 +4,9 @@
 /datum/fabricator_recipe/protolathe/weapon/tier0/revolver
 	path = /obj/item/gun/projectile/revolver/handmade/empty
 
+/datum/fabricator_recipe/protolathe/weapon/tier0/pistol
+	path = /obj/item/gun/projectile/pistol/handmade/empty
+
 /datum/fabricator_recipe/protolathe/weapon/tier0/shotgun
 	path = /obj/item/gun/projectile/shotgun/handmade/empty
 
@@ -13,6 +16,9 @@
 /datum/fabricator_recipe/protolathe/weapon/tier1/bolt_action
 	path = /obj/item/gun/projectile/bolt_action/simple/empty
 
+/datum/fabricator_recipe/protolathe/weapon/tier1/pistol_pocket
+	path = /obj/item/gun/projectile/pistol_pocket/simple/empty
+
 /datum/fabricator_recipe/protolathe/weapon/tier1/pistol
 	path = /obj/item/gun/projectile/pistol/simple/empty
 
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm
index ac81de075e4..93315582de1 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm
@@ -18,5 +18,5 @@
 		/decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE
 	)
 
-/obj/item/gun/projectile/pistol/simple/empty
+/obj/item/gun/projectile/pistol_pocket/simple/empty
 	starts_loaded = FALSE
\ No newline at end of file

From b7a252edfb986e9e491bd39a781e8afc7ee01088 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:01:16 -0400
Subject: [PATCH 07/25] Make legacy ammunition types unprintable

---
 mods/persistence/modules/projectiles/overrides.dm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm
index 03882b5ed51..5380d7996e0 100644
--- a/mods/persistence/modules/projectiles/overrides.dm
+++ b/mods/persistence/modules/projectiles/overrides.dm
@@ -33,3 +33,18 @@
 
 /datum/fabricator_recipe/protolathe/weapon/bullpup
 	research_excluded = TRUE
+
+/datum/fabricator_recipe/protolathe/ammo
+	research_excluded = TRUE
+
+/datum/fabricator_recipe/protolathe/ammo/stunshell
+	research_excluded = TRUE
+
+/datum/fabricator_recipe/protolathe/ammo/ammo_emp_small
+	research_excluded = TRUE
+
+/datum/fabricator_recipe/protolathe/ammo/ammo_emp_pistol
+	research_excluded = TRUE
+
+/datum/fabricator_recipe/protolathe/ammo/ammo_emp_slug
+	research_excluded = TRUE
\ No newline at end of file

From 818fb651a64e52371c1c673d2f5b27eb0af9ce99 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:04:51 -0400
Subject: [PATCH 08/25] updates .22LR bullet descriptions to be less vague

---
 .../modules/projectiles/ammunition/22_LR/bullets.dm           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm
index 9798f4ce8a9..9e4e8b23cea 100644
--- a/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm
+++ b/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm
@@ -14,7 +14,7 @@
 
 /obj/item/ammo_casing/twentytwolr/handmade
 	name = "makeshift .22LR round"
-	desc = ".22 Long Rifle round of dubious origin. Struggles at medium-long range and against armor due to shoddy construction."
+	desc = ".22 Long Rifle round of dubious origin. Sports poor range and very poor armor penetration due to shoddy construction."
 	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier0.dmi'
 	projectile_type = /obj/item/projectile/bullet/twentytwolr/handmade
 
@@ -25,7 +25,7 @@
 
 /obj/item/ammo_casing/twentytwolr/simple
 	name = "standard .22LR round"
-	desc = ".22 Long Rifle round of ancient design. Servicable, but struggles against armored targets due to unimpressive stopping power."
+	desc = ".22 Long Rifle round of ancient design. Sports unimpressive range and poor armor penetration due to low velocity."
 	icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi'
 	projectile_type = /obj/item/projectile/bullet/twentytwolr/simple
 

From d6ebd4bfd88c1b5f5f0efd30d7d8a85b8941e75f Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 09:56:55 -0400
Subject: [PATCH 09/25] Add DMI files for .45 rounds

---
 .../icons/obj/ammunition/22lr/tier1.dmi         | Bin 480 -> 476 bytes
 .../icons/obj/ammunition/45/tier0.dmi           | Bin 0 -> 483 bytes
 .../icons/obj/ammunition/45/tier1.dmi           | Bin 0 -> 492 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 mods/persistence/icons/obj/ammunition/45/tier0.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/45/tier1.dmi

diff --git a/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi b/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi
index 36b1785daad869641393279cdec5bacf2ac2f461..bda96d6ac356b78da6220cd238d8cada6539892f 100644
GIT binary patch
delta 259
zcmV+e0sQ{p1Kb0UBnv7~OjJd{z`%b&B#|;C1fu!QSdm(xf6qxoK~z|U?UyYM0x=MU
zOTxmkRm<N2-~@02j(`G7LVy!&FbFgl{F-_U5?Hf_dtsSZ(x#~)<b7_YZ(g69Rw+XM
zi$)%4&>hbr6HJ6bvI=&{g~4#=R;L%M)f53n#ax`Wwo;wl+!rj?gIYA&`yhj4Q}o?8
z_*lMbuf`qWWe_*7RAc}`2q7dE*!P{#d3~4l8P<0RwYA<W1A<D{Cp<@k3?mtANWMIA
z2qA<J@`=WV=X-B)g#rCU#nf$(J!D-PRP;O%j<QTWaze<@@doqz8#y}<P!s?F002ov
JPDHLkV1j7ja9aQX

delta 263
zcmcb^{D66a3ZHI(Pl)S*0|)9IRkDpGChDuO%)F*5H8Ff){RK}K$B>BD<OB)U#R(OR
zZjP*{cm&Ki7hGWN(_q^mIw7Y?p^Nd6=#S81y#oSCu7wSS(M(-B)t0NW-ZB5s_0SjG
z-Jo>fqT?jSoYdS!KXMgVjMl{}tl?NMT%~#W`~ioB%x(uYKt_x7FnJwh3egi^`K!`z
z(WmD!4o}xRK2A;xd7o~!K+~f6)cjt({yYZrU6aiga4%re@tqTBzy;H*z${nN$gCo@
zf!&w+d}fL0xgWd_>{?I7HwW(R7AQEx5~8Qh_!MMElOsEW=zF=@#WFD~8Gyjk)z4*}
HQ$iB}fI(v4

diff --git a/mods/persistence/icons/obj/ammunition/45/tier0.dmi b/mods/persistence/icons/obj/ammunition/45/tier0.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..fa451eab9723c4eb5ad7f5eefdb4e9351ad3b77f
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq004jh003YF0{{R3Csb#80000gP)t-sz`($A
zIw;9zL0Bjvj7%;)IW&}zg=S_}hK-TL#Kb2jAC#1o*4Ea*z`$q$@X`PP00DGTPE!Ct
z=GbNc004!0R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM
z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+Gp{T)uOz>yQa7nICnvQ;iHkEOv#1y-
zWyr;uR+N~V3SnbvAgHoDzbGdKp~?b}Dgu@(E4cc(fV~F*Y#&2{0`kG^0002iNkl<Z
zScUDDAr8VY7=?>y7<2*#Cx8pU5jX^p;29P}NKp78IKadV2DJkqCL!!lAbJ0iHcb&E
zywAPAf4@A}Dn-awY4rjH$vCjUXf_Em4ErEh_*WQwCY^4*4On0^hr{+Bm!q>?rqkUD
z2k29#vJ2h?3K(>+UIM)q1-w~a3fGDqeF(d+RA2!@2q7dC@!ofQ@5gt{rwVf}a^rcg
zOR-R6&g8ii7+I;51H|>kA%qY@{+?J4Dmh5(f}6MyKRpHJfjMtH?^C-#9Wh3ZbwbF`
Z@d6X!9{EWQ<=OxM002ovPDHLkV1kZx!Dj#f

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/45/tier1.dmi b/mods/persistence/icons/obj/ammunition/45/tier1.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..533747aefc8cf8ed55d0f6ba89dc98358b6a8e60
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq004jh003YF0{{R3Csb#80000jP)t-sz`($a
zOfK=GM9F4BSSTW@V*vQrVBDY^hK-TL#Kdqi0F;!J*4Ea*z`%b&BnGL$7ytkO0d!JM
zQvg8b*k%9#0EK!~Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq
z(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6zbuPimMB)_OqH>oryC$&V0i!&v&
zs2C_^$i<mfl$e_eVPk3_sIol2C?^G>$^wrn0+uT)xca$(y$1knA47ry^1<u?007)c
zL_t(oh3%Fh4#GebL>EygX-%PUfN}yj0hgd8SVFOwh6IHN!2v32@I3&c5<+jmMX=0o
zvYX8!NSNp5@BGQQze*AERXUMlz+f_WE09dx0@N^qfYiQ1{HeTbXPp2A#@huvb~7~l
z7k!wQ<SQ8T_Gk!deL%V%m6(WyOaa~|kF^FP%WG+}=<yD2`${<$AcPP?ToL!aZ@VAf
zQJ-tnh0v|@-c-WSpgzfW84$=yl^h_ZFAgDu5c2nga!|{`OdoI)3*pl;Ab6lITIc<x
i4^T&xzQIli`8nR^V;=T8K*bRN0000<MNUMnLSTZ}zRuME

literal 0
HcmV?d00001


From 01b9642b7b6dbfce6d60576524cbff9e8bb3b9ac Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:17:27 -0400
Subject: [PATCH 10/25] Add .45 mags/boxes, update 10mm weapons to .45

---
 mods/persistence/_persistence.dme             |   2 +
 .../icons/obj/ammunition/magazines.dmi        | Bin 906 -> 1600 bytes
 .../projectiles/ammunition/22_LR/magazines.dm |   4 +-
 .../projectiles/ammunition/45/bullets.dm      |  34 +++++++++
 .../projectiles/ammunition/45/magazines.dm    |  66 ++++++++++++++++++
 .../guns/projectile/tier0/revolver.dm         |   2 +-
 .../guns/projectile/tier1/pistol.dm           |   3 +-
 .../guns/projectile/tier1/pistol_gold.dm      |   4 +-
 .../guns/projectile/tier1/revolver.dm         |  10 +--
 9 files changed, 114 insertions(+), 11 deletions(-)
 create mode 100644 mods/persistence/modules/projectiles/ammunition/45/bullets.dm
 create mode 100644 mods/persistence/modules/projectiles/ammunition/45/magazines.dm

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index 2d332640d32..5cdc625fedb 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -225,6 +225,8 @@
 #include "modules\projectiles\overrides.dm"
 #include "modules\projectiles\ammunition\22_LR\bullets.dm"
 #include "modules\projectiles\ammunition\22_LR\magazines.dm"
+#include "modules\projectiles\ammunition\45\bullets.dm"
+#include "modules\projectiles\ammunition\45\magazines.dm"
 #include "modules\projectiles\guns\projectile.dm"
 #include "modules\projectiles\guns\energy\tier0\lasrifle.dm"
 #include "modules\projectiles\guns\energy\tier1\laspistol.dm"
diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi
index 1357749bcf0ae2b729112e2d378f764fb7bfb251..c9e5efa77009ba72f715dad3baf8982ff63ccc41 100644
GIT binary patch
delta 1526
zcmV<S1qu3!2fz#^iBL{Q4GJ0x0000DNk~Le0001>0001>2m=5B0K5^G9{>OVY>_2i
ze@0MqFE>ahCm&W;X28I}aylqo2^nJm0004WQchC<K<3zH0002MdQ@0+L}hbha%pgM
zX>V=-0C=30)3FM|Fc1ddIeCiE&Xp!<adMFs>0n<$Dvc&kEhIsGd>cE6gXGVagO9ua
z4wAEdd+2)B96S0@)|vUvcC6ZzlswJofAvyGL5Wu8s{L9xKX|n~Ga)8hW|WM^x~1ln
zT<maD>-$#~HR!N@98(1sAdHVa&#x02@oQxQhGj}zo)RH`)*!1Iy+M!yrl142FM@=J
z$2Ug;hJ7WZkX}e8<QPG1|EZj{ee?PKZ&YLvW;2Uz>i_@*wn;=mRCt{2oau7ne=rb)
zZB9eXxqy_w+PL!m@3<PtHl$WF!)kDjt?A0YudMD86JweZS*B8{RH`4OeB?A9r*mfg
z$<!;EXL&xG&E|770neF$lcFdV3p4@8vt<r?L2abGoPbu7RGuwg*6a1l8V?}k<!ZCp
ztTuQ+hC2fg6+p(z6^IH*b7!z+e*$nkX95;XK$_<{y#Z40#*6gl_)mC+zkNU*K^;LI
z!5=+>JJ25AAR#a3pkMd~GCW%zKu0`)ke4UW5f8}lY-#)!nB_pc9Q!RAmx(-Eb{dG6
zof5f9rBbO>svu*A<wSe-klZs1X(8qAnFf!DKa1V3zoRUqynW_EB2L(Ze_?$mI}C?>
zuMqJqirIdyU*E(Hq}=C&fMX;e)6d=3j~ht&Egu??{9t8o>qiZw{OrT|d}zQ45zrdO
zU&zmw*VlIckbLwfQ?s+d0$JaTwleP4_Yu*2^eYV4TZoAJ&wPYb?tzPVLGzIT+kAFs
zDgW6hnL|FO-T8v%qejr|fA=AuvGMiy`{19>Lq2o9p!ui~bi)G?;r@W#Kp=vQLq2o<
zjpbur;aymQx&uFj<N5f2*nEEiZv*0YL2HROfKT8crk{f)sOyL35A<_3KHs0l*?#V;
z#rAVwE$!!2DwXQL7yVu@=TaH0&v+7-%HWO5Q+O|~pF_AIDxqiaf15wm&*9vVrInoD
z`xE^f%DYwrGm!ER{zN~A@~#&$NHr<tAN+}a4&}W8(w_EwWRv(`{_%hWw{1TE*(YMr
za%dN#5jgI}^>Y-rT|VeXBBNw`e_zo2Gxz>XKSy)h=d;m|kM_<#g}Z;G>EcZFa}0Mc
zOrI|rz});(IQSPne*)6aar~|TLk#+YD~SjHVv6;19KSEXum-RzxKg-_AN-Mij^o*V
zK}A&j$=t^Wf25z|cxQm_kCb!$+ynjHunpW3`nzEpxM%ct12=H;{w^E3fs?MTQmIrb
zl}f0p9+pd0ooE9om#R9QNCzpG3f89#q+BY$KH(tcQnl-&e+E(><j*G)2b2k3w+2;J
zMK6`|Hb4$1l<@<~1n&(Fhp0u*r{^RdbZwf(WoWQdI~1?md`%ON*m7tWq7gXW1~?qR
z0S}1ty35x<#J@+W?)}|g0&fFs^M(va@Vd{}9Aa+?^__nT4*^C@K!VrREnhT1b@NZ*
z8T=14TPh#Jf2-rX%NI3pyz@`u!VQF5*?4{o`Qib92md5496@g|J{^zf`cnRk9US{R
zEwa9pOGof#fUGa&(hbb&Iv8N<OSyCeo!;J@0r7S(<kB4k)iwP%BH=J%IWvM3A6#a)
z8$r>HeG%vQmEwcT`0ql=fFvJW*F3zF=GQbnxURj@f4EAeQmIrb6{`n-KM?<UKH>GO
zpr0cRoQlO_Q4m~mJu9xigL7ll0c0tEARyh}h4aVw!7M3%AmEk!;8(5+>U^)`CBy0K
zpAc{=3`k$k$xYvt%IBts{OK;oONP@w{l)3KZ=jB#j-Za9IN;ZhAl1*o2u+v~WH@;}
zE3Th=NT1KAZ~z(ms?zb2;pFv?1SI=8XYkGh5OG#qKj#Mwo|lmGy;9BxWcs<1Ie;wX
cD%JPYA0Jx=UMf(SmjD0&07*qoM6N<$f^8P!<NyEw

delta 827
zcmV-B1H}Bm42lOOiBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cT9GAQ
zf5_lIvj6}90d!JMQvg8b*k%9#0F!!DSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1
z<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AXCZ6D5uCkiHkEO
zv#1!zH{{|>D@x2wg|Jao>6#L$jyUrSe~DA2YeA$s!nP*mSHu(RLWEi)5)>1yk`(6}
zlHvrMp{lIl>gNJZA^_v*m3-}=dzt_M0zXMaK~!jg?U~(nf-n$-MG&zD75bA{?EAlF
zvw_xLusdy54?XS9?RT;>ng|T8Rwk3l^s7{?qslU$gZb4aNeEEXb-mrP4w!=ge^t{o
zyB(k4p&;$qF<R~_Qd{u>_J_k^f8Y(2+_lH!u{}xwNRok$yOtydH~|C13lN|Y0~Ce)
z0kk}BKl%a|-+{#g*b!KI2Nn<T-;Y2?>iG|-<ZerP6aqYvo_PZ$cQ2%8A%IUG!9U!I
zyE1(RrDFqp=uX^yhznpcnM|fXe<Sa8T<srkh?0fKQGe&}<zMG_l7-Asf3IMIaeh?D
z;;6sFe*Zb&&l@0)`a9y+`SS*d!zXvZ!*%|w0pj?{-L;j#g9rYA<0p5S`!0+Y%zVE-
ziF~Ep0rC$Nf%mUd1m0g2VDb-Lko@a4$0vjABjEdf^!H)jzwbwXh9_x`e?Z(^ia@_F
z?gvN_Se~TY0qTW4yT6FvCV+6h5T6Y4uL2=R7dXsGx~o94kme(f`#bFSK{#LE;i$jE
zey<hk@37yi1AzW+{oZ6Unf{MZe;58ezX?bEKHd|>5n7J={d7-eM`$_f_q6^@BVO;r
zQGZYCX+SwYK+92ozpkGjf1u^4zYl3~T0c8L%Ta$HF6Z-<e}2A_qyA3)H;v%dZ+3%<
zgZ@5(7~#UsZ<0kW2mL+yM|HzRnBQ!&Iq2^`HQVU#hYPcQoS(^IfA?d#j(m7yInB@H
zKj`;peI8f$d-eMPZNI<4`vGmg*S{Z7_j@fjnM}**9lI%P5|@fi4ZZ*X002ovPDHLk
FV1k5RjcNb@

diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm
index 81422fee461..8f88b889a74 100644
--- a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm
+++ b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm
@@ -19,7 +19,7 @@
 	material = /decl/material/solid/metal/steel
 	caliber = CALIBER_22LR
 	ammo_type = /obj/item/ammo_casing/twentytwolr
-	max_ammo = 20
+	max_ammo = 30
 
 /obj/item/ammo_magazine/twentytwolr/handmade
 	name = "makeshift .22LR magazine"
@@ -51,7 +51,7 @@
 		/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT
 	)
 	ammo_type = /obj/item/ammo_casing/twentytwolr/simple
-	max_ammo = 8
+	max_ammo = 12
 
 /obj/item/ammo_magazine/box/twentytwolr/simple
 	name = "packet of standard .22LR rounds"
diff --git a/mods/persistence/modules/projectiles/ammunition/45/bullets.dm b/mods/persistence/modules/projectiles/ammunition/45/bullets.dm
new file mode 100644
index 00000000000..1ec040d76ed
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/45/bullets.dm
@@ -0,0 +1,34 @@
+#define CALIBER_45 ".45"
+
+/obj/item/ammo_casing/fortyfive
+	name = "generic .45 round"
+	desc = "An unsettlingly generic .45 round."
+	icon = 'mods/persistence/icons/obj/ammunition/45/tier1.dmi'
+	caliber = CALIBER_45
+	projectile_type = /obj/item/projectile/bullet/fortyfive
+
+/obj/item/projectile/bullet/fortyfive
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	damage = 20
+	distance_falloff = 1
+
+/obj/item/ammo_casing/fortyfive/handmade
+	name = "makeshift .45 round"
+	desc = ".45 round of dubious origin. Sports poor range and poor armor penetration due to shoddy construction."
+	icon = 'mods/persistence/icons/obj/ammunition/45/tier0.dmi'
+	projectile_type = /obj/item/projectile/bullet/fortyfive/handmade
+
+/obj/item/projectile/bullet/fortyfive/handmade
+	damage = 30
+	distance_falloff = 5
+	penetration_modifier = 1.2
+
+/obj/item/ammo_casing/fortyfive/simple
+	name = "standard .45 round"
+	desc = ".45 round of ancient design. Sports mediocre range due to unimpressive velocity."
+	icon = 'mods/persistence/icons/obj/ammunition/45/tier1.dmi'
+	projectile_type = /obj/item/projectile/bullet/twentytwolr/simple
+
+/obj/item/projectile/bullet/fortyfive/simple
+	damage = 40
+	distance_falloff = 3
\ No newline at end of file
diff --git a/mods/persistence/modules/projectiles/ammunition/45/magazines.dm b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm
new file mode 100644
index 00000000000..29883ae77b9
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm
@@ -0,0 +1,66 @@
+/obj/item/ammo_magazine/fortyfive
+	name = "generic .45 magazine"
+	desc = "An unsettlingly generic .45 magazine."
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	icon_state = "451"
+	mag_type = MAGAZINE
+	caliber = CALIBER_45
+	material = /decl/material/solid/metal/steel
+	ammo_type = /obj/item/ammo_casing/fortyfive
+	initial_ammo = 0
+	max_ammo = 0
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/box/fortyfive
+	name = "packet of generic .45 rounds"
+	desc = "A packet of unsettlingly generic .45 rounds."
+	icon_state = "box_451"
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	material = /decl/material/solid/metal/steel
+	caliber = CALIBER_45
+	ammo_type = /obj/item/ammo_casing/fortyfive
+	max_ammo = 20
+
+/obj/item/ammo_magazine/fortyfive/handmade
+	name = "makeshift .45 magazine"
+	desc = ".45 magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship."
+	icon_state = "450"
+	origin_tech = "{'combat':1}"
+	material = /decl/material/solid/plastic
+	ammo_type = /obj/item/ammo_casing/fortyfive/handmade
+	max_ammo = 3
+
+/obj/item/ammo_magazine/box/fortyfive/handmade
+	name = "packet of makeshift .45 rounds"
+	desc = "Container of dubious origin intended for holding loose .45 rounds."
+	icon_state = "box_450"
+	origin_tech = "{'combat':1,'materials':1}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/fortyfive/handmade
+
+/obj/item/ammo_magazine/fortyfive/simple
+	name = "standard .45 magazine"
+	desc = ".45 magazine of ancient design. Servicable capacity, but outpaced by more modern designs."
+	icon_state = "451"
+	origin_tech = "{'combat':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT
+	)
+	ammo_type = /obj/item/ammo_casing/fortyfive/simple
+	max_ammo = 7
+
+/obj/item/ammo_magazine/box/fortyfive/simple
+	name = "packet of standard .45 rounds"
+	desc = "Container of ancient design intended for holding loose .45 rounds."
+	icon_state = "box_451"
+	origin_tech = "{'combat':2,'materials':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/fortyfive/simple
\ No newline at end of file
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
index 4bb5394164f..b338f1440e9 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
@@ -3,7 +3,7 @@
 	desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in .45."
 	icon = 'mods/persistence/icons/obj/guns/tier0/revolver.dmi'
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
-	caliber = CALIBER_PISTOL
+	caliber = CALIBER_45
 	ammo_type = /obj/item/ammo_casing/pistol
 	max_shells = 3
 	w_class = ITEM_SIZE_NORMAL
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
index c675c6462a4..637c2b8be3a 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
@@ -2,10 +2,11 @@
 	name = ".45 'Colt' HG"
 	desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in .45."
 	icon = 'mods/persistence/icons/obj/guns/tier1/pistol.dmi'
+	caliber = CALIBER_45
 	fire_delay = 5
 	force = 5
 	accuracy = 1
-	one_hand_penalty = 0
+	one_hand_penalty = 1
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	ammo_indicator = FALSE
 	w_class = ITEM_SIZE_NORMAL
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm
index 13b63862984..f15b77a59b9 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm
@@ -1,6 +1,6 @@
 /obj/item/gun/projectile/pistol/simple/golden
-	name = "10mm 'Colt-M' HG"
-	desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armored targets. Chambered in 10mm."
+	name = ".45 'Colt-M' HG"
+	desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armored targets. Chambered in .45."
 	icon = 'mods/persistence/icons/obj/guns/tier1/pistol_gold.dmi'
 	origin_tech = "{'combat':3,'engineering':2,'materials':5}"
 	material = /decl/material/solid/metal/steel
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
index 4369159ffa4..c1b0f571b17 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
@@ -1,15 +1,15 @@
 /obj/item/gun/projectile/revolver/simple
-	name = "10mm 'Chief' RV"
-	desc = "Revolver of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm."
+	name = ".45 'Chief' RV"
+	desc = "Revolver of ancient design. Reliable, but struggles against armored targets. Chambered in .45."
 	icon = 'mods/persistence/icons/obj/guns/tier1/revolver.dmi'
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
-	caliber = CALIBER_PISTOL
+	caliber = CALIBER_45
 	ammo_type = /obj/item/ammo_casing/pistol
 	max_shells = 5
 	w_class = ITEM_SIZE_NORMAL
 	fire_delay = 10
-	accuracy = 0
-	one_hand_penalty = 0
+	accuracy = 2
+	one_hand_penalty = 1
 	force = 5
 	material = /decl/material/solid/metal/steel
 	matter = list(

From 3b0b7b37ff51c863e2ffa3775cba4fb05c61f939 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:43:26 -0400
Subject: [PATCH 11/25] Add 5.56 ammunition DMIs

---
 .../icons/obj/ammunition/5.56/tier0.dmi           | Bin 0 -> 564 bytes
 .../icons/obj/ammunition/5.56/tier1.dmi           | Bin 0 -> 576 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 mods/persistence/icons/obj/ammunition/5.56/tier0.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/5.56/tier1.dmi

diff --git a/mods/persistence/icons/obj/ammunition/5.56/tier0.dmi b/mods/persistence/icons/obj/ammunition/5.56/tier0.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..8accdaef19f8986182b83c9f6f8c078a70e60167
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq005u>004jl0{{R3eocQU0000jP)t-sz`($A
zIw;9zL0Bjvj7%;)IW)q;!uR+0l#qpHW>$oRgeNB-qokwj?CZe5z}~C4j{pDw0d!JM
zQvg8b*k%9#0Ec>1Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq
z(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6zbuPimMB)_OqH>oryC$&V0i!&v&
zs2C_^$i<mfl$e_eVPk3_sIol2C?^G>$^wrn49ig!D=WDAxq!U~0BpxYiIe~xn*aa-
zB1uF+RA_<i*t-qFFc1b{Q#b_=iN^*J1F!-^AUUE*1yTke6CgoHLlMza)6g>l3$P0n
z#o5+ftegZw|JTJi|30PhfiVF8Z8Fx)>*WjG!0A#sa6TiCmaoosVqlLnXx)je?pOW^
zLcH5w*!Mw)Rms-dLvtewtJR$ils<two=Ko>nt~13iVd#miqK(dgAuf&tc(_YgbjA&
z3bDa7_M+RMF@<h}#tfA60001fNtsp<jvn4hb`|o(;m9Aqyyt4OVFQEx!3o~NuC7b&
zeT(^!u819aBXH!C2@{?)r1QHYTKtRv0002^SGmGJ&cj#tj4sEAOOM0|TK^0SMu~wW
zBDy(pNb5iV0Dx~&zm(Lk&4;u(^<t+KMh^f0_;GLZXg9h?wn)JM0000<MNUMnLSTZk
C*z#fk

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/5.56/tier1.dmi b/mods/persistence/icons/obj/ammunition/5.56/tier1.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..09e8d05a4c846c17a771b6bd731558bbb3c6ef29
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq005u>004jp0{{R3yS<Vr0000vP)t-sz`($a
zOfK=GL|7;y$!0;SV*tX!!uR+0_}F0Fpc{mQgm5wdbSWj!WlzCGK3gm#qokwj?CZe5
zz)e1)8UO$Q0d!JMQvg8b*k%9#0Ec>1Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1
z<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6zbuPimMB)_Oq
zH>oryC$&V0i!&v&s2C_^$i<mfl$e_eVPk3_sIol2C?^G>$^wrn49ig!D=WDAxq!U~
z0BpxYiIe~xn*aa-B1uF+RCt{2*-MgxFbqXe?2gPQ|NU>a9Ws~bdeC+%_lzC$A`7Yz
z!vFyIJSnwK;7d9Gw9ep3`INd2800f)^D-9c_bV@-*)%JAFJ%c<Xn(+_$>y`LL0G}E
zC<$x6+0AFw*=vF*pw<FwK63)vT$$GcK>#h^CCVpPP^{ne8s*!-FQ9n7x0{^rI96}p
z`EqX^!%-hE9oO$gdjS52-tz$f006+()2EB_Xv1Bj4d>P!)Zvgc{;K&)Py}_nrY#uD
zSV;-=`JlH%uVBzcn_5ho(Wyi79X<g>m*3+v0{{R30002Glk=%{gty1@**ZcqkKGm>
zlVRh@9D9Jy?wc=sXu|L9UjP6A02n^trKtPY%I;sxT|JC800000{J}3+<_8V;p}B+r
O0000<MNUMnLSTYl8~+~w

literal 0
HcmV?d00001


From 3742556f0013de63a0c39892b8e36fbe78e4c52c Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:57:05 -0400
Subject: [PATCH 12/25] Add magazine icons + bulletcode

---
 .../icons/obj/ammunition/magazines.dmi        | Bin 1600 -> 2041 bytes
 .../projectiles/ammunition/45/bullets.dm      |   2 +-
 .../projectiles/ammunition/5.56/bullets.dm    |  35 ++++++++++
 .../projectiles/ammunition/5.56/magazines.dm  |  66 ++++++++++++++++++
 4 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm
 create mode 100644 mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm

diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi
index c9e5efa77009ba72f715dad3baf8982ff63ccc41..dd3a8852554aae4dd4f417d8092d1f9fbae0bf54 100644
GIT binary patch
delta 1960
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

delta 1516
zcmV<I1rz%D55No|iBL{Q4GJ0x0000DNk~Le0001>0001>2m=5B0K5^GACVzwe<vp&
zR#s-fz`$}kC|wB|V*mgE0d!JMQvg8b*k%9#0Kj@wSad{Xb7OL8aCB*JZU6vyoR!nD
z3c@fD2H-h)iqOuLCTVeUkrwG-UqLF3CQvOTL4AB1JBWki&z6IayZ;W7vweH$de$5}
z`cT%H`ObE%+LV+$&FJ+~NI{8Kf99(FS~x#=wLCK+CR=8djK;d9=9FCQa8v91R~0qr
zuznm<1s5QUk3G+?6B_YrWdep}N?e{2A%4~%s~WvQkOHQl1Gg`NgonpBM*@a@C8UsE
zNG9YML2du3oV9)P`TcKHWD#aFi*4%w00g#4L_t(|ob8<Ha^f%$gl$ekf6Tdnl)&1!
z^8W9*8p$@KRx`tDaE`6%%D=Cy?h+GYni5&2QmIs`AEbQbG#;mOX8p<3E173`KAX+v
zb2I_ZnShg`C>9Ge0mrjt4thatq`aJfR+ChoEnn8_^~)L$Amrt0v)QaRctD0b0}vHJ
z#>*9m3P^Kjuw?>pJZAzHe@sA{=Q+IrQtrl!^ym0bc!j@xKpjCHK^?&#J%T&X9^W7#
zFXy0N_y#gOTOL41Jb;jwC(scO$nb1w{1%wyK)f9LEgF}JJX>}eh?kubxk{x{sZ^>U
zV}|8Kd-jmrGYe@U<?fjVkBC2u-LJo+ETp`B=0YM)*o0wyCp!#>e|)bH@hytkey(5N
z#0{j}=YxP_Bp}nz-PVsANck-v8j$>8WpC?84W#_+!})w@zzGr18pdD9&zINNcK?uk
z^e0oZv%vyc-;B00?$-Aa(R}nP4A)zTi2KicgjDW<i+DlvkpbI$c4sO7*(jMqKBwLJ
zg65+}(CqgipRw`vfA{;~pUy)*bH1SYs1bC-0}<i=fZaeKf{a5xbN-FxV_xB1Sc19(
zKZWD@_<-1ae*$j<;&(x7i8p{x;2@@-gC(fzhvpCTb2dKTpT^mK?yJT2b6+j(=Ts_{
z>c1ELUN7fT8LZEE5|_&0jmuMbFRq_MxFIT`XYiXp)z9JFe~_h>oZtHs{T#}>Rs%DT
z@(=z*KZo+J7cxjSDdivhiGB{{y#dmm_IzZM_+S3<fCRT~KL6P#V$pJF7orh3?#1<U
z6t`VI=tm->WP5*K(EKy^{!BkdbKB>$(T|Vz&Oe2_f28T+O!adNcP~tzFB-ty{8Kpi
z7d`^g&vE>&e*i-a`hqKo2mfM<^>ZA*FTk({uq(JyxQieBk$#Tj*?mDpRQ$=@#|M9;
zpW}FEfbNf!bN$={{oSw)+!Ok{VH>z-^mhX{aPs~x8@hp$uC7w4R4SE9sHz^8OI4j{
z11XoPI-N)dDVGY?rwpWAD!)GAAmviE>!Suz9^}s_e-j6k30}7bRaHeVmGU+~4kwiH
z1Ih&N4GxE>MbD?_Bp!5an#N^luv0q}uiJc06OY((XcwXpINk<09KZn&i1WJ3*FeO-
zN2%`p-CqK418nn#3`p?0&(|DcZwd9Ce+mx)Mod70*VQdwG(dIpPvIH-4>VgUAH%ET
zyvr9ge{j6>PvXK2gj?Boehm5I0e}bpBrY65Z!kU`kLdbR{)`<Q`#UYNzLZNx@MeIl
zFXhq=%<4KAVCze{bOfE=-kbsPb}!`89R$@i{Wv1wFk(3~f)pQIX15zb(T#l(=lGT4
zgUk5uLdk$6A6(Zwyp!hFG(Nblz0$Z!rBbO>e<~HL2Y){h|9L*)^{k+uBMqF2#bQwq
zTyi}tuD^qGW7Gj;DSsd!-QR`t$N0f4DSsf~mHgmWt_tdWuj3`d>Fb{ma4HN)U(d-+
z-<8Veric9LF2_rT(?9*i>AP>Bj-Za9j-WW;*N-68&%p>ym=R<+c|9wxpL?Irr*Hrn
zLi?)H@si=>^^XK3`#ERu&IAx~R$M>l2MnH<kn_D#&Ie@rxso}6EafWI_tYOBTLxY#
SP?(nh0000<MNUMnLSTZ7Y~eHj

diff --git a/mods/persistence/modules/projectiles/ammunition/45/bullets.dm b/mods/persistence/modules/projectiles/ammunition/45/bullets.dm
index 1ec040d76ed..c3b8e894759 100644
--- a/mods/persistence/modules/projectiles/ammunition/45/bullets.dm
+++ b/mods/persistence/modules/projectiles/ammunition/45/bullets.dm
@@ -27,7 +27,7 @@
 	name = "standard .45 round"
 	desc = ".45 round of ancient design. Sports mediocre range due to unimpressive velocity."
 	icon = 'mods/persistence/icons/obj/ammunition/45/tier1.dmi'
-	projectile_type = /obj/item/projectile/bullet/twentytwolr/simple
+	projectile_type = /obj/item/projectile/bullet/fortyfive/simple
 
 /obj/item/projectile/bullet/fortyfive/simple
 	damage = 40
diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm
new file mode 100644
index 00000000000..a98e4ec2e48
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm
@@ -0,0 +1,35 @@
+#define CALIBER_556 "5.56x45mm"
+
+/obj/item/ammo_casing/fivefiftysix
+	name = "generic 5.56x45mm round"
+	desc = "An unsettlingly generic 5.56x45mm round."
+	icon = 'mods/persistence/icons/obj/ammunition/5.56/tier1.dmi'
+	caliber = CALIBER_556
+	projectile_type = /obj/item/projectile/bullet/fivefiftysix
+
+/obj/item/projectile/bullet/fivefiftysix
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	damage = 25
+	distance_falloff = 1
+
+/obj/item/ammo_casing/fivefiftysix/handmade
+	name = "makeshift 5.56x45mm round"
+	desc = "5.56x45mm round of dubious origin. Sports poor range and poor armor penetration due to shoddy construction."
+	icon = 'mods/persistence/icons/obj/ammunition/5.56/tier0.dmi'
+	projectile_type = /obj/item/projectile/bullet/fivefiftysix/handmade
+
+/obj/item/projectile/bullet/fivefiftysix/handmade
+	damage = 35
+	distance_falloff = 4
+	penetration_modifier = 1
+
+/obj/item/ammo_casing/fivefiftysix/simple
+	name = "standard 5.56x45mm round"
+	desc = "5.56x45mm round of ancient design. Sports good armor penetration capabilities, but most firearms which use it are bulky."
+	icon = 'mods/persistence/icons/obj/ammunition/5.56/tier1.dmi'
+	projectile_type = /obj/item/projectile/bullet/fivefiftysix/simple
+
+/obj/item/projectile/bullet/fivefiftysix/simple
+	damage = 45
+	distance_falloff = 2
+	penetration_modifier = 0.8
\ No newline at end of file
diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm
new file mode 100644
index 00000000000..13c07dcd20d
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm
@@ -0,0 +1,66 @@
+/obj/item/ammo_magazine/fivefiftysix
+	name = "generic 5.56x45mm magazine"
+	desc = "An unsettlingly generic 5.56x45mm magazine."
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	icon_state = "5561"
+	mag_type = MAGAZINE
+	caliber = CALIBER_556
+	material = /decl/material/solid/metal/steel
+	ammo_type = /obj/item/ammo_casing/fivefiftysix
+	initial_ammo = 0
+	max_ammo = 0
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/box/fivefiftysix
+	name = "packet of generic 5.56x45mm rounds"
+	desc = "A packet of unsettlingly generic 5.56x45mm rounds."
+	icon_state = "box_5561"
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	material = /decl/material/solid/metal/steel
+	caliber = CALIBER_556
+	ammo_type = /obj/item/ammo_casing/fivefiftysix
+	max_ammo = 50
+
+/obj/item/ammo_magazine/fivefiftysix/handmade
+	name = "makeshift 5.56x45mm magazine"
+	desc = "5.56x45mm magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship."
+	icon_state = "5560"
+	origin_tech = "{'combat':1}"
+	material = /decl/material/solid/plastic
+	ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade
+	max_ammo = 12
+
+/obj/item/ammo_magazine/box/fivefiftysix/handmade
+	name = "packet of makeshift 5.56x45mm rounds"
+	desc = "Container of dubious origin intended for holding loose 5.56x45mm rounds."
+	icon_state = "box_5560"
+	origin_tech = "{'combat':1,'materials':1}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade
+
+/obj/item/ammo_magazine/fivefiftysix/simple
+	name = "standard 5.56x45mm magazine"
+	desc = "5.56x45mm magazine of ancient design. Servicable capacity, but outpaced by more modern designs."
+	icon_state = "5561"
+	origin_tech = "{'combat':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT
+	)
+	ammo_type = /obj/item/ammo_casing/fivefiftysix/simple
+	max_ammo = 20
+
+/obj/item/ammo_magazine/box/fivefiftysix/simple
+	name = "packet of standard 5.56x45mm rounds"
+	desc = "Container of ancient design intended for holding loose 5.56x45mm rounds."
+	icon_state = "box_5561"
+	origin_tech = "{'combat':2,'materials':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/fivefiftysix/simple
\ No newline at end of file

From d6e2881484d7e1c3abf78648edf6783a71b0f30a Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:58:26 -0400
Subject: [PATCH 13/25] oops

---
 mods/persistence/_persistence.dme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index 5cdc625fedb..b61164f49f2 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -223,6 +223,8 @@
 #include "modules\power\fusion\fuel_injector.dm"
 #include "modules\projectiles\ammunition.dm"
 #include "modules\projectiles\overrides.dm"
+#include "modules\projectiles\ammunition\5.56\bullets.dm"
+#include "modules\projectiles\ammunition\5.56\magazines.dm"
 #include "modules\projectiles\ammunition\22_LR\bullets.dm"
 #include "modules\projectiles\ammunition\22_LR\magazines.dm"
 #include "modules\projectiles\ammunition\45\bullets.dm"

From e28fa9d106c977cb8bee20620a86ad7d01c0f343 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 16:01:04 -0400
Subject: [PATCH 14/25] Update 5.56 weapons to 5.56x45mm

---
 .../projectiles/guns/projectile/tier0/boltaction.dm       | 8 ++++----
 .../projectiles/guns/projectile/tier1/boltaction.dm       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
index e4c46f05a91..76d262ed22e 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
@@ -1,15 +1,15 @@
 /obj/item/gun/projectile/bolt_action/handmade
-	name = "5.56 'Minuteman' BA"
-	desc = "Bolt-action rifle of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity. Chambered in 5.56."
+	name = "5.56x45mm 'Minuteman' BA"
+	desc = "Bolt-action rifle of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity. Chambered in 5.56x45mm."
 	icon = 'mods/persistence/icons/obj/guns/tier0/boltaction.dmi'
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
-	caliber = CALIBER_RIFLE
+	caliber = CALIBER_556
 	handle_casings = HOLD_CASINGS
 	load_method = SINGLE_CASING
 	max_shells = 1
-	ammo_type = /obj/item/ammo_casing/rifle
+	ammo_type = /obj/item/ammo_casing/fivefiftysix
 	one_hand_penalty = 20
 	fire_delay = 20
 	accuracy = -1
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm
index 202c4d3451d..5fa9d034bf3 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm
@@ -1,16 +1,16 @@
 /obj/item/gun/projectile/bolt_action/simple
-	name = "5.56 'Mosin' BA"
-	desc = "Bolt-action rifle of ancient design. Reliable, but slow-firing. Chambered in 5.56."
+	name = "5.56x45mm 'Mosin' BA"
+	desc = "Bolt-action rifle of ancient design. Reliable, but slow-firing. Chambered in 5.56x45mm."
 	icon = 'mods/persistence/icons/obj/guns/tier1/boltaction.dmi'
 	force = 10
 	slot_flags = SLOT_BACK
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
-	caliber = CALIBER_RIFLE
+	caliber = CALIBER_556
 	handle_casings = HOLD_CASINGS
 	load_method = SINGLE_CASING
 	max_shells = 5
 	w_class = ITEM_SIZE_HUGE
-	ammo_type = /obj/item/ammo_casing/rifle
+	ammo_type = /obj/item/ammo_casing/fivefiftysix
 	one_hand_penalty = 10
 	fire_delay = 12
 	accuracy = 0

From e122892490e06f620528cceedc797b39ce10ef05 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Tue, 18 Jul 2023 16:07:50 -0400
Subject: [PATCH 15/25] Update 5.56x45mm fire sound

---
 mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm
index a98e4ec2e48..1d4a139b9c0 100644
--- a/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm
+++ b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm
@@ -8,7 +8,7 @@
 	projectile_type = /obj/item/projectile/bullet/fivefiftysix
 
 /obj/item/projectile/bullet/fivefiftysix
-	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	fire_sound = 'sound/weapons/gunshot/gunshot3.ogg'
 	damage = 25
 	distance_falloff = 1
 

From 9928ac5a3146ca4184ce07685d18c628633f050d Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Wed, 19 Jul 2023 09:28:24 -0400
Subject: [PATCH 16/25] Add new designs to protolathe

---
 mods/persistence/_persistence.dme             |  1 +
 .../designs/protolathe/designs_ammunition.dm  | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index b61164f49f2..cbd9e8491ff 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -132,6 +132,7 @@
 #include "modules\fabrication\_fabricator.dm"
 #include "modules\fabrication\fabricator_build.dm"
 #include "modules\fabrication\fabricator_intake.dm"
+#include "modules\fabrication\designs\protolathe\designs_ammunition.dm"
 #include "modules\fabrication\designs\protolathe\designs_weapons.dm"
 #include "modules\fabrication\designs\textile\space.dm"
 #include "modules\hydroponics\grown.dm"
diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm
new file mode 100644
index 00000000000..1896e70b598
--- /dev/null
+++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm
@@ -0,0 +1,35 @@
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier0
+	path = /obj/item/ammo_magazine/fivefiftysix/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier0
+	path = /obj/item/ammo_magazine/box/fivefiftysix/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier1
+	path = /obj/item/ammo_magazine/fivefiftysix/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier1
+	path = /obj/item/ammo_magazine/box/fivefiftysix/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier0
+	path = /obj/item/ammo_magazine/twentytwolr/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier0
+	path = /obj/item/ammo_magazine/box/twentytwolr/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier1
+	path = /obj/item/ammo_magazine/twentytwolr/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier1
+	path = /obj/item/ammo_magazine/box/twentytwolr/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier0
+	path = /obj/item/ammo_magazine/fortyfive/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier0
+	path = /obj/item/ammo_magazine/box/fortyfive/handmade
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier1
+	path = /obj/item/ammo_magazine/fortyfive/simple
+
+/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier1
+	path = /obj/item/ammo_magazine/box/fortyfive/simple
\ No newline at end of file

From 32b4c9c386b0f28b610946d5e6edf371af07a342 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:05:36 -0400
Subject: [PATCH 17/25] Add 12g boxes and ammunition

---
 .../obj/ammunition/12g/tier0_buckshot.dmi     | Bin 0 -> 426 bytes
 .../icons/obj/ammunition/12g/tier0_slug.dmi   | Bin 0 -> 454 bytes
 .../obj/ammunition/12g/tier1_buckshot.dmi     | Bin 0 -> 467 bytes
 .../icons/obj/ammunition/12g/tier1_slug.dmi   | Bin 0 -> 460 bytes
 .../icons/obj/ammunition/magazines.dmi        | Bin 2041 -> 2891 bytes
 .../projectiles/ammunition/12g/bullets.dm     |  82 ++++++++++++++++++
 .../projectiles/ammunition/12g/magazines.dm   |  67 ++++++++++++++
 7 files changed, 149 insertions(+)
 create mode 100644 mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi
 create mode 100644 mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi
 create mode 100644 mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
 create mode 100644 mods/persistence/modules/projectiles/ammunition/12g/magazines.dm

diff --git a/mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi b/mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..77a394c7eb89c294691eeb201d8793620256b16f
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq003YB003YF0{{R35VmRy0000RP)t-sz`(#}
zW>!5pG?b8qCnq0<jgiE}#FUhj*4EahW?*vw0004WQchC<K<3zH0001adQ@0+L}hbh
za%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+
z(=$pSoZ^zil2jm5DKoDuHLoPUs8WfGGbOXA7$|1Q#hF%=n41b=!&R2&7v-cNR9T>?
zQdV&Fa{)U50P5%_##z@?7XSbNxJg7oR9J=WmoW~)FbqWvB2CvK4nUy?0C53?dVn6G
zM_{94Hgaq_*56ViFEH@m_MLpa(Xt5nGdAAB_Tns@Tc_Z5IIg{i5e3)NW33Pq3ih2E
zG>sNwVHVugpzl`;Mo_{C3b+N*`UE07r$EFhAcPP<m5yVvkcVXox%9t&>pUgx&pOY7
zr_NC;!VBIdq7pw4LJ0XjH4YMFyboYMnEhc2upi9+Fa?>$WvWnMkD{RCAcXvy4_p5h
Ush)Ub_W%F@07*qoM6N<$f^77!4*&oF

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi b/mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..6ef3562f6c9c78e05ce0a2a138b7bb05df231038
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq003YB003YF0{{R35VmRy0000aP)t-sz`(#}
zW>!5pG?b8qCnq0<jgiE}#Bg6d*1wXJl$6%i)~k|Xv8OxE00001bW%=J06^y0W&i*H
zd3sb>bVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F
z0CJ3txHvOXGt)ClAe`co#FA7XQz<jAEH$qrzo=4)i!&v&s2C__$i<mfl$e_eVZ&9H
z=NILqAXHhPs8UvN^>YC`008RfCdOIUR2KjM0Lw{4K~z|U?U%6)0x=9l4N@-3wJ-pO
z7yvdvOmHJ)1j>`>s3OtOa#dQg07zMmlxJJY$qf|vb>GR?OJ@Z@`7;*M!g4Pxbe&MJ
zT5oFS#*@Kt*q&+y7jd@Xx<i8yu#gspkdJ7PbG2Z@?NxgaqX^ED`}Qpqz(pn~3ZVc%
zC{Pqdk<;MlXA7yHCX?pww@;kMi2VuYBDmx1u);jZIXJ4M7ZgQNl<(8hK_r>}56FIC
w`-2t8eqj596=3w!)KCHc6d4?QP?TTu0qq_n)mH^3LI3~&07*qoM6N<$g5oN`M*si-

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi b/mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..d2af21ce53cb751273a2f87f6c22072f9b5eb669
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR30000mP)t-sz`(%V
zpc|@V0QlHoa54afjgiE}#EeWX@uNhPl$6%i*319^$!0<S003AhBAEaHdA8-600001
zbW%=J06^y0W&i*Hd3sb>bVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqK
zuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co#FA7XQz<jAEH$qrzo=4)i!&v&s2C__
z$i<mfl$e_eVZ&9H=NILqAXHhPs8UvN^>YC`008RfCdOIUR2KjM0L)25K~!jg?b%BX
z!ypU<Py!{xx4r*ui_~>IQBrTBd0U%t!U{wPBJxC=_kftZ^P}rO#FVyIyuLo~b{!>c
zG2WO^n_2FqjFo@fFvc9_4%!3yoC7fO1JH4O0Lq*lZ)^Q6So_oa$2A}D%MalVIPTAH
zf^Yts;G8caA|mon<^i9a{?BMF9~X18kN>Cgt5vS{guSsZAo*-Uu9d70tj-%mL_|bH
z9)jKvSOa-rAoqh)=YLi=8)!Zquo{ee+D`N7BhTu%Toe&`t}n4R1cyrYP)`5=002ov
JPDHLkV1lL-%8CF0

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi b/mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..f518903334ff7c3e81d622e510a2f038a98f10a0
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq003YB003YF0{{R35VmRy0000dP)t-sz`(%V
zpc|@V0QlHoa54afjgiE}#EeWX@uNhPl$6%i*2!i;SSTVQKn?`}0004WQchC<K<3zH
z0001adQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL
zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DKoDuHLoPUs8WfGGbOXA7$|1Q#hF%=n41b=
z!&R2&7v-cNR9T>?QdV&Fa{)U50P5%_##z@?7XSbN&PhZ;R9J=Wm%R<bFc5_gBqwr2
zLBRn04FF;R!~_|^TQ~&+M53W3Ra#uqP^6(_EmG#rlA~*&;C<aY`{{FcG7<PQCfdSu
zrz~t%O2J{VOr0Ai2GxFjN)>F&b6!8TY|wS{WTCqFBO7?1Eadg`oO)11FL-J0s|EDd
z35aG&0g+Mw004S29^Ggml*44g*!|+pbJKEv;JFuEdA3|(ZsMG*RLTng006#EAqTC<
z@_!)qL$p7lg4hqy{)h_HxM9kqApR5?9!mn?*L(o;h$Pop8;d3Y0000<MNUMnLSTXe
CslaXk

literal 0
HcmV?d00001

diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi
index dd3a8852554aae4dd4f417d8092d1f9fbae0bf54..a8b5e989fcf56df9fe78d044ce8085cd1c607f0e 100644
GIT binary patch
literal 2891
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

literal 2041
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
XBui|ujR3{c00000NkvXXu0mjf2P*AY

diff --git a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
new file mode 100644
index 00000000000..0c695dab982
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
@@ -0,0 +1,82 @@
+#define CALIBER_12g "12g"
+
+/obj/item/ammo_casing/twelvegauge
+	name = "generic 12g shell"
+	desc = "An unsettlingly generic 12g shell."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
+	caliber = CALIBER_12g
+	projectile_type = /obj/item/projectile/bullet/twelvegauge
+
+/obj/item/ammo_casing/twelvegauge/slug
+	name = "generic 12g slug shell"
+	desc = "An unsettlingly generic 12g slug shell."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
+	caliber = CALIBER_12g
+	projectile_type = /obj/item/projectile/bullet/twelvegauge
+
+/obj/item/projectile/bullet/twelvegauge
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
+	damage = 40
+	distance_falloff = 3
+
+/obj/item/ammo_casing/twelvegauge/buckshot
+	name = "generic 12g buckshot shell"
+	desc = "An unsettlingly generic 12g buckshot shell."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi'
+	caliber = CALIBER_12g
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge
+
+/obj/item/projectile/bullet/pellet/twelvegauge
+	fire_sound = 'sound/weapons/gunshot/shotgun.ogg'
+	damage = 10
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+
+/obj/item/ammo_casing/twelvegauge/slug/handmade
+	name = "makeshift 12g slug shell"
+	desc = "12g slug shell of dubious origin. Sports decent armor penetration capabilities and high damage, but suffers from poor range."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi'
+	projectile_type = /obj/item/projectile/bullet/twelvegauge/handmade
+
+/obj/item/projectile/bullet/twelvegauge/handmade
+	damage = 40
+	distance_falloff = 5
+	penetration_modifier = 1.1
+
+/obj/item/ammo_casing/twelvegauge/buckshot/handmade
+	name = "makeshift 12g buckshot shell"
+	desc = "12g buckshot shell of dubious origin. Sports high damage, but suffers from poor armor penetration and very poor range."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi'
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/handmade
+
+/obj/item/projectile/bullet/pellet/twelvegauge/handmade
+	damage = 10
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+	penetration_modifier = 1.5
+
+/obj/item/ammo_casing/twelvegauge/slug/simple
+	name = "standard 12g slug shell"
+	desc = "12g slug shell of ancient design. Sports decent armor penetration capabilities and high damage, but suffers from poor range."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
+	projectile_type = /obj/item/projectile/bullet/twelvegauge/simple
+
+/obj/item/projectile/bullet/twelvegauge/simple
+	damage = 60
+	distance_falloff = 5
+	penetration_modifier = 0.9
+
+/obj/item/ammo_casing/twelvegauge/buckshot/simple
+	name = "standard 12g buckshot shell"
+	desc = "12g buckshot shell of ancient design. Sports high damage, but suffers from poor armor penetration and very poor range."
+	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi'
+	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/simple
+
+/obj/item/projectile/bullet/pellet/twelvegauge/simple
+	damage = 15
+	pellets = 6
+	range_step = 1
+	spread_step = 10
+	penetration_modifier = 1.3
\ No newline at end of file
diff --git a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm
new file mode 100644
index 00000000000..49c6b21b254
--- /dev/null
+++ b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm
@@ -0,0 +1,67 @@
+/obj/item/ammo_magazine/box/twelvegauge
+	name = "packet of generic 12g shells"
+	desc = "A packet of unsettlingly generic 12g shells."
+	icon_state = "box_12g1_slug"
+	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
+	material = /decl/material/solid/metal/steel
+	caliber = CALIBER_12g
+	ammo_type = /obj/item/ammo_casing/twelvegauge
+	max_ammo = 16
+
+/obj/item/ammo_magazine/box/twelvegauge/slug
+	name = "packet of generic 12g slug shells"
+	desc = "A packet of unsettlingly generic 12g slug shells."
+	icon_state = "box_12g1_slug"
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug
+
+/obj/item/ammo_magazine/box/twelvegauge/buckshot
+	name = "packet of generic 12g buckshot shells"
+	desc = "A packet of unsettlingly generic 12g buckshot shells."
+	icon_state = "box_12g1_buckshot"
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot
+
+/obj/item/ammo_magazine/box/twelvegauge/slug/handmade
+	name = "packet of makeshift 12g slug shells"
+	desc = "Container of dubious origin intended for holding loose 12g slug shells."
+	icon_state = "box_12g0_slug"
+	origin_tech = "{'combat':1,'materials':1}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade
+
+/obj/item/ammo_magazine/box/twelvegauge/buckshot/handmade
+	name = "packet of makeshift 12g buckshot shells"
+	desc = "Container of dubious origin intended for holding loose 12g buckshot shells."
+	icon_state = "box_12g0_buckshot"
+	origin_tech = "{'combat':1,'materials':1}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/handmade
+
+/obj/item/ammo_magazine/box/twelvegauge/slug/simple
+	name = "packet of standard 12g slug shells"
+	desc = "Container of ancient design intended for holding loose 12g slug shells."
+	icon_state = "box_12g1_slug"
+	origin_tech = "{'combat':2,'materials':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple
+
+/obj/item/ammo_magazine/box/twelvegauge/buckshot/simple
+	name = "packet of standard 12g buckshot shells"
+	desc = "Container of ancient design intended for holding loose 12g buckshot shells."
+	icon_state = "box_12g1_buckshot"
+	origin_tech = "{'combat':2,'materials':2}"
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/plastic   = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/cardboard = MATTER_AMOUNT_TRACE
+	)
+	ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple
\ No newline at end of file

From 03d8f98abdda9f8b2de59dc18e3517c83dee5e07 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:10:22 -0400
Subject: [PATCH 18/25] Update shotguns to use new caliber

---
 .../modules/projectiles/guns/projectile/tier0/shotgun.dm        | 2 +-
 .../modules/projectiles/guns/projectile/tier1/shotgun_db.dm     | 2 +-
 .../modules/projectiles/guns/projectile/tier1/shotgun_pump.dm   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
index 839c2a8d6f1..9d7f860becc 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
@@ -8,7 +8,7 @@
 	w_class = ITEM_SIZE_HUGE
 	force = 5 // lacks a butt for effective rifle-whipping
 	slot_flags = SLOT_BACK
-	caliber = CALIBER_SHOTGUN
+	caliber = CALIBER_12g
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	screen_shake = 2
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
index 90e12a57390..381e9c76e08 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
@@ -8,7 +8,7 @@
 	w_class = ITEM_SIZE_HUGE
 	force = 10
 	slot_flags = SLOT_BACK
-	caliber = CALIBER_SHOTGUN
+	caliber = CALIBER_12g
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	screen_shake = 1
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
index 2a3034cb96d..c5d65070de1 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
@@ -7,7 +7,7 @@
 	w_class = ITEM_SIZE_HUGE
 	force = 10
 	slot_flags = SLOT_BACK
-	caliber = CALIBER_SHOTGUN
+	caliber = CALIBER_12g
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	load_method = SINGLE_CASING
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag

From baba01c4b4ebf0394dbd5b0c802dd6b4c620d719 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:13:38 -0400
Subject: [PATCH 19/25] Fix calbier var

---
 .../persistence/modules/projectiles/ammunition/12g/bullets.dm | 4 ++--
 .../modules/projectiles/guns/projectile/tier0/shotgun.dm      | 2 +-
 .../modules/projectiles/guns/projectile/tier1/shotgun_db.dm   | 2 +-
 .../modules/projectiles/guns/projectile/tier1/shotgun_pump.dm | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
index 0c695dab982..81f0c32ae6d 100644
--- a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
+++ b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
@@ -1,10 +1,10 @@
-#define CALIBER_12g "12g"
+#define CALIBER_12G "12g"
 
 /obj/item/ammo_casing/twelvegauge
 	name = "generic 12g shell"
 	desc = "An unsettlingly generic 12g shell."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	projectile_type = /obj/item/projectile/bullet/twelvegauge
 
 /obj/item/ammo_casing/twelvegauge/slug
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
index 9d7f860becc..4078714a801 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
@@ -8,7 +8,7 @@
 	w_class = ITEM_SIZE_HUGE
 	force = 5 // lacks a butt for effective rifle-whipping
 	slot_flags = SLOT_BACK
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	screen_shake = 2
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
index 381e9c76e08..b9dd22ee8b2 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
@@ -8,7 +8,7 @@
 	w_class = ITEM_SIZE_HUGE
 	force = 10
 	slot_flags = SLOT_BACK
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	screen_shake = 1
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
index c5d65070de1..350870c7adf 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
@@ -7,7 +7,7 @@
 	w_class = ITEM_SIZE_HUGE
 	force = 10
 	slot_flags = SLOT_BACK
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	load_method = SINGLE_CASING
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag

From 14780f1d7333125c5340ed1b37e2b1bea1770003 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:15:24 -0400
Subject: [PATCH 20/25] Add new files to persistence.dme

---
 mods/persistence/_persistence.dme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index cbd9e8491ff..0beef1d8006 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -226,6 +226,8 @@
 #include "modules\projectiles\overrides.dm"
 #include "modules\projectiles\ammunition\5.56\bullets.dm"
 #include "modules\projectiles\ammunition\5.56\magazines.dm"
+#include "modules\projectiles\ammunition\12g\bullets.dm"
+#include "modules\projectiles\ammunition\12g\magazines.dm"
 #include "modules\projectiles\ammunition\22_LR\bullets.dm"
 #include "modules\projectiles\ammunition\22_LR\magazines.dm"
 #include "modules\projectiles\ammunition\45\bullets.dm"

From e3c67763b0bf32c33b1d57720b3526acab9b5aac Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:17:21 -0400
Subject: [PATCH 21/25] oops lol

---
 .../persistence/modules/projectiles/ammunition/12g/magazines.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm
index 49c6b21b254..80b02aba78c 100644
--- a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm
+++ b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm
@@ -4,7 +4,7 @@
 	icon_state = "box_12g1_slug"
 	icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi'
 	material = /decl/material/solid/metal/steel
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	ammo_type = /obj/item/ammo_casing/twelvegauge
 	max_ammo = 16
 

From 826ecf1a3c4d0881f5a58b81ae7d3ee6ee1a8e5e Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:18:30 -0400
Subject: [PATCH 22/25] okay look i'm distracted

---
 .../persistence/modules/projectiles/ammunition/12g/bullets.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
index 81f0c32ae6d..6aa5e19889b 100644
--- a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
+++ b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm
@@ -11,7 +11,7 @@
 	name = "generic 12g slug shell"
 	desc = "An unsettlingly generic 12g slug shell."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi'
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	projectile_type = /obj/item/projectile/bullet/twelvegauge
 
 /obj/item/projectile/bullet/twelvegauge
@@ -23,7 +23,7 @@
 	name = "generic 12g buckshot shell"
 	desc = "An unsettlingly generic 12g buckshot shell."
 	icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi'
-	caliber = CALIBER_12g
+	caliber = CALIBER_12G
 	projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge
 
 /obj/item/projectile/bullet/pellet/twelvegauge

From 930d76ea39e0437f16cb53f6220092fdeb1e79c9 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 11 Sep 2023 09:30:05 -0400
Subject: [PATCH 23/25] Fix Colt magazine + bullet stuff for other guns

---
 .../modules/projectiles/guns/projectile/tier0/boltaction.dm   | 2 +-
 .../modules/projectiles/guns/projectile/tier0/revolver.dm     | 2 +-
 .../modules/projectiles/guns/projectile/tier0/shotgun.dm      | 2 +-
 .../modules/projectiles/guns/projectile/tier1/pistol.dm       | 2 ++
 .../modules/projectiles/guns/projectile/tier1/revolver.dm     | 2 +-
 .../modules/projectiles/guns/projectile/tier1/shotgun_db.dm   | 4 ++--
 .../modules/projectiles/guns/projectile/tier1/shotgun_pump.dm | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
index 76d262ed22e..f82989eaa53 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm
@@ -9,7 +9,7 @@
 	handle_casings = HOLD_CASINGS
 	load_method = SINGLE_CASING
 	max_shells = 1
-	ammo_type = /obj/item/ammo_casing/fivefiftysix
+	ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade
 	one_hand_penalty = 20
 	fire_delay = 20
 	accuracy = -1
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
index b338f1440e9..29dd1838640 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm
@@ -4,7 +4,7 @@
 	icon = 'mods/persistence/icons/obj/guns/tier0/revolver.dmi'
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
 	caliber = CALIBER_45
-	ammo_type = /obj/item/ammo_casing/pistol
+	ammo_type = /obj/item/ammo_casing/fortyfive/handmade
 	max_shells = 3
 	w_class = ITEM_SIZE_NORMAL
 	fire_delay = 12
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
index 4078714a801..cfaf579981e 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm
@@ -10,7 +10,7 @@
 	slot_flags = SLOT_BACK
 	caliber = CALIBER_12G
 	origin_tech = "{'combat':2,'engineering':1,'materials':1}"
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade
 	screen_shake = 2
 	accuracy = -1
 	one_hand_penalty = 10
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
index 637c2b8be3a..6b2113d316b 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm
@@ -10,6 +10,8 @@
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	ammo_indicator = FALSE
 	w_class = ITEM_SIZE_NORMAL
+	magazine_type = /obj/item/ammo_magazine/fortyfive/simple
+	allowed_magazines = /obj/item/ammo_magazine/fortyfive
 	material = /decl/material/solid/metal/steel
 	matter = list(
 		/decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT,
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
index c1b0f571b17..7947ed52b90 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm
@@ -4,7 +4,7 @@
 	icon = 'mods/persistence/icons/obj/guns/tier1/revolver.dmi'
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	caliber = CALIBER_45
-	ammo_type = /obj/item/ammo_casing/pistol
+	ammo_type = /obj/item/ammo_casing/fortyfive/simple
 	max_shells = 5
 	w_class = ITEM_SIZE_NORMAL
 	fire_delay = 10
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
index b9dd22ee8b2..13feb548112 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm
@@ -10,7 +10,7 @@
 	slot_flags = SLOT_BACK
 	caliber = CALIBER_12G
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple
 	screen_shake = 1
 	accuracy = 0
 	one_hand_penalty = 10
@@ -22,7 +22,7 @@
 	burst_delay = 0
 	firemodes = list(
 		list(mode_name="fire one barrel at a time", burst=1),
-		list(mode_name="fire both barrels at once", burst=2)
+		list(mode_name="fire two barrels at a time", burst=2)
 	)
 
 /obj/item/gun/projectile/shotgun/simple/empty
diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
index 350870c7adf..cb2fd3c2fb4 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm
@@ -10,7 +10,7 @@
 	caliber = CALIBER_12G
 	origin_tech = "{'combat':3,'engineering':2,'materials':2}"
 	load_method = SINGLE_CASING
-	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple
 	handle_casings = HOLD_CASINGS
 	one_hand_penalty = 10
 	material = /decl/material/solid/metal/steel

From 577b9ce2e82268ca021f956f95093363123d3d68 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 11 Sep 2023 09:39:47 -0400
Subject: [PATCH 24/25] Add Sawn-Off Shotgun

---
 mods/persistence/_persistence.dme                |   1 +
 .../icons/obj/guns/tier1/shotgun_db_sawn.dmi     | Bin 0 -> 1175 bytes
 .../guns/projectile/tier1/shotgun_db_sawn.dm     |  14 ++++++++++++++
 3 files changed, 15 insertions(+)
 create mode 100644 mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi
 create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm

diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index 0beef1d8006..cf2cac0df94 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -246,6 +246,7 @@
 #include "modules\projectiles\guns\projectile\tier1\pistol_pocket.dm"
 #include "modules\projectiles\guns\projectile\tier1\revolver.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm"
+#include "modules\projectiles\guns\projectile\tier1\shotgun_db_sawn.dm"
 #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm"
 #include "modules\reagents\Chemistry-Holder.dm"
 #include "modules\reagents\chems\chems.dm"
diff --git a/mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi b/mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..b2b9998977b9de80ff5577ccfd7cf460ffa4a113
GIT binary patch
literal 1175
zcmV;I1Zew-P)<h;3K|Lk000e1NJLTq005u>005u_0{{R3dEt5<0000XP)t-sz`(#T
zHAYZXWN$Sfj*pnT#mB;VFp*RvLM9_1CNRLjz$E7`*8l(j0d!JMQvg8b*k%9#0H=CX
zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVU
zjkq{7QZv&tN+6u#lEji!AXBM4zbGd~iHkEOv#1!zH{{|>D@x2wg|Jao>89oulvEN_
zn^BsZn3tcKqL7rIQmI><lV1{_6Q7Zohh&Qh(K?GL)TvvZnVOT5N|p&Z6q}Hgn4FDE
zpR$6hp9?t306#B?`jO_OQ2+n~aY;l$RA_<in!j(;KorOCVoH-Oi7Y}l$1#X*5k^Vb
zYAa=~Di$^<67JYyDaYuxL(P@|1N^txv2#D)xv^ad1os`HckjLX+}TN+Z_h=@$jHb@
zD?BLV&@mdc;aRW3#YU%ej244_bKdOS9Sq$}$8?N`i=go)XVKMg5|Q}puN50#Tze-?
zi4l2?C$XO<{FwNu{jM3$BK`{hOjB`uOX8bDvC*Z`6yi7xFzu~`1@dt>O)#HD)}>cY
zarR>f7}Cg>7L>=^bv_510EaNptNF38rkyPi`9K}l1tK)Joy|^0@D*HzP`XOX68Pj2
zs_uWN4Sc-WLnm0m<)~P%j!Gc7!EB55f%sYWvNzV1ho^OcMn*<PMn*=UTxR+@4&1^l
zjm3Gz%?!1<bBw4*^BmBwS%iAZIeH{4>Z#o}bCEbC8er+?GT<c*iy08m=gN@(V+Jvk
zF98*6*a_ICH2x1!gD8dIj7|`-GVK2lHHcCO&hSR>8C&E3wgyoS!5Q9&E9*8`8bl?8
zW}LCRs`r1TK~%!38Ae7%Mn*<|o5~|oI_}dKpreTRs+t+vXN$$+L<CNFV25?Q&4Oov
z!xf7R|7GgBhpy{NrtG-@WF27^d~<nVk>M>P9vnPfF0Vx3NEoq>Q50RTh11j`!(Va_
zq3&FEP%CNNofj=u94AuA$}?O)Xa{rS%R<GksTmHFDm6LXmG=Z>bQmKeBcp#-n%~Eb
zWi54opf_A;PCjZ@igYVg%DN*2o;ZUKKkn5LiKoExEXyZ^Bu#);dW%#b9(^M5QKM_l
zkC+@KXTQld-VB#ZIh(@a_^8d-r~<Uze$s-c0I@qh;H?X$FEmr-2N9BQqCL3~8eS^E
zN<Ua^kt5)6_C+Y4BUzPxFqd$EXupUOp(;7UTvdKhCgSkB^bYq_V5J`{RbDi<rAOt!
z6Y^dBV1N5o4?@|Ss-MVR{2<=GD|_+=TdVoMSQr@@{b#c7Z>gsl^qt?v1}et`xwJO$
zPXKQdAPL@wU4hqXu6x%8cr#RiZFZO@*bx%>sKq_RYX<<19l39J;17hvYtC6=05<Og
zTua_-gKq=OekiabWLg5}NIrjb+5^R#*l&Hw>P>6|R39B?_~1c-sE^0ZpHM=;?6b6P
p4D3OUv3K~;K630lFwn?Ir{4-inQW$Y1&#m!002ovPDHLkV1n0x9qRx9

literal 0
HcmV?d00001

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm
new file mode 100644
index 00000000000..17665428294
--- /dev/null
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm
@@ -0,0 +1,14 @@
+/obj/item/gun/projectile/shotgun/simple/sawnoff
+	name = "compact 12g 'Bouncer' SG"
+	desc = "Break-action shotgun of ancient design. Powerful and can be worn on the waist, but struggles in prolonged engagements due to low ammo capacity and unwieldiness. Can fire one or both chambers at a time. Chambered in 12 gauge."
+	icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi'
+	w_class = ITEM_SIZE_BULKY
+	force = 5
+	slot_flags = SLOT_LOWER_BODY|SLOT_BACK
+	origin_tech = "{'combat':3,'engineering':3,'materials':2}"
+	screen_shake = 2
+	accuracy = -1
+	one_hand_penalty = 15
+
+/obj/item/gun/projectile/shotgun/simple/sawnoff/empty
+	starts_loaded = FALSE
\ No newline at end of file

From 7d2f86358e1ab80c8cf75853aae5e7738b9c54e7 Mon Sep 17 00:00:00 2001
From: genessee-forgot-his-password-again
 <80235421+genessee-forgot-his-password-again@users.noreply.github.com>
Date: Mon, 11 Sep 2023 09:42:31 -0400
Subject: [PATCH 25/25] Fix w_class thing

---
 .../projectiles/guns/projectile/tier1/shotgun_db_sawn.dm        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm
index 17665428294..49897071c70 100644
--- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm
+++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm
@@ -2,7 +2,7 @@
 	name = "compact 12g 'Bouncer' SG"
 	desc = "Break-action shotgun of ancient design. Powerful and can be worn on the waist, but struggles in prolonged engagements due to low ammo capacity and unwieldiness. Can fire one or both chambers at a time. Chambered in 12 gauge."
 	icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi'
-	w_class = ITEM_SIZE_BULKY
+	w_class = ITEM_SIZE_LARGE
 	force = 5
 	slot_flags = SLOT_LOWER_BODY|SLOT_BACK
 	origin_tech = "{'combat':3,'engineering':3,'materials':2}"