From 5c6a6c7da0dd0b70d8d4c032bf7ea0243508e347 Mon Sep 17 00:00:00 2001 From: genessee-forgot-his-password-again <80235421+genessee-forgot-his-password-again@users.noreply.github.com> Date: Fri, 29 Dec 2023 23:41:41 -0600 Subject: [PATCH 01/33] Fix 'Zip' + 12g boxes --- .../icons/obj/ammunition/magazines.dmi | Bin 2891 -> 2890 bytes .../icons/obj/guns/tier0/pistol.dmi | Bin 891 -> 940 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index a8b5e989fcf56df9fe78d044ce8085cd1c607f0e..269d93b83d167e073b870cd6fe95244c6a81ef00 100644 GIT binary patch delta 301 zcmV+|0n+}<7RnZo%6}GmR9JLGWpiV4X>fFDZ*Bkpc$}SQxfS1>3D#0v>6>f=ix(KzuRx1Qu{|4SQ!C)epV+sn-^6OXdfO?#Is87%_gJe$JQ z!w@Rr)MZoEW*W4~O*t%GrLJAz3a4l~JmI`C2U*#b^hXR4@v1V0zz@u=sp(#GuU^LKJcq;t46kQcI|ZI8Ly_ zEC{}V5ydXoA6V=OS`gPKL?6ly<{mNN+XLkVvyK?}-bq!#L0|g{?C{G|f^RtXr;Dyz z!x8!H`A3MC1tF!0*%Wb`BBmXFuk=r^G~25u)BR@rb9e(~i#`h47pYLQ>H%R1$bgO9 delta 302 zcmV+}0nz@-7Rwfp%6}JnR9JLGWpiV4X>fFDZ*Bkpc$}4%%WlFj5JlJVS6HwP$~Xj8 zY$_09QGNkINt39wkz(`s{Ki2l>MCb;9_eW2-s_R&seRjQcYC{j-7~Q1?adOj4IkRflKc!!eZoapK&i%O)l{H=XZmG0A6l{C_T==l@h%K#uhjMy28) zI6n5&J`Pmki_H}0001h2m=5B0K2`CDUl&5k!2@B z3=9ku6chje06HQDkdTlrEiA08tSKiZK|wz)Ei1slz#=+mACkg2WQ&5r*snl!E&u=k z0d!JMQvg8b*k%9#0IiX;aewL-=j4~f7sY2J=A|HXnh>oshd7;Jw~^zrq|}@ef~M!^ zp{c`RKG+qxiRroq#49z#rBqqL)z1YSQ2_s8fNav?u-@DdBqTF_=LgOZ$UP(hX1>8700000Mt?+v65-l{BrLX( zBy_Ao5*AvXj$p1;ASCj~wNaBu#3g6JIL>D}cI{OXil{|Cq>*c{3X#ujoz5W>OgdYl zwhF_DxJg3eTU&L!vLC)gIdrt3JXs`Wf~s<={pS)~f9YM4%B!O%IQL7;3{?Z7*smLc zne?$o@{Nr0Jx700000004lo@hnj5V4kf^NtFzV%f_`)lUhDm zM9?1Rlf?-3$tSNHWW%$2_ky-JI23_>ct>EG0bU z>&>fc36?C&ynmiz$u@Isa5L=QeCb5N`_7k6Xg+o$^!;(mg25PqHmBJ8H3)dNpZl-x zAJ-Nf+x`C6wF3YE004kxJpFfUg}?tVzTo``0sw$*gyu1*Yq!qd;c&dB-8#q9>A=0} ybnVuWFJpENb?w&iehunA!tM2uE&u>j`~zQH4Yyff^9?8f0000+h8w?B# z6ciKy001I7XdjZoIAn`DA_juO*ucQRkxC~gkdTlrEiA08tSKiZK|wz)Eh}!E#BTrq z00DGTPE!Ct=GbNc005+svvGgM7w6=c=oaZ_B<7_cbea&YGlw{xV7HOxGF_1Q@kyyU zB?L{+&qGs(YQD09tDg%vNC7o@XIGoE4-5bR0t87!K~#90?V9Ow!Y~Yk;~bPiTaJMq z6dFp8_kYAH$0R0L0p(I@_xllMJh69UJ7%QF^8f$<9ASLIs7U+SH6VX{75z+BX$Df+ z3`5Y*u=;@s3lalin65-Pm;v7e71AjQ1~WiQU@DxN?A=01;Mjz|_|@RHO*A5R?gdEoBbftk&Y1Qw>9YqwqEA0E1BOv@w~ucplQBCM>C4{;dXwCp zoDRr9oqlqW>U+t|UFv^~HUMv+#b1NVfzufope;Bcrw&Gg>H`1(000007(@X`yL^GO zw)A>Lna~t00000Ko_VK71)3JI%N$x<(FlXUxwAU z>IQdHYz|z#pT1kl&IX z1H6k^{CflHOQ3JydfC4pK0d!x9UKndn)={c`2iq@3tcF0BE$dy002ovPDHLkV1kf8 BH~atq From 9ead79cd35cd0f5cc2fa551f6fcd783cd74133c0 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, 31 Dec 2023 15:17:50 -0600 Subject: [PATCH 02/33] Add sprites for T2 guns --- mods/persistence/_persistence.dme | 8 ++++---- .../icons/obj/guns/tier2/laspistol.dmi | Bin 0 -> 635 bytes .../icons/obj/guns/tier2/lasrifle.dmi | Bin 0 -> 1423 bytes mods/persistence/icons/obj/guns/tier2/pistol.dmi | Bin 0 -> 761 bytes .../icons/obj/guns/tier2/pistol_pocket.dmi | Bin 0 -> 833 bytes .../icons/obj/guns/tier2/revolver.dmi | Bin 0 -> 1479 bytes .../icons/obj/guns/tier2/shotgun_pump.dmi | Bin 0 -> 3862 bytes mods/persistence/icons/obj/guns/tier2/smg.dmi | Bin 0 -> 1861 bytes 8 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 mods/persistence/icons/obj/guns/tier2/laspistol.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/lasrifle.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/pistol.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/revolver.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/smg.dmi diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index 88d6b3909a7..be37fd87228 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -25,13 +25,13 @@ #include "controllers\subsystems\mapping.dm" #include "controllers\subsystems\mining.dm" #include "controllers\subsystems\persistence.dm" +#include "controllers\subsystems\skills.dm" +#include "controllers\subsystems\initialization\chargen.dm" +#include "controllers\subsystems\initialization\fabrication.dm" #include "controllers\subsystems\persistence\persistence_loading.dm" #include "controllers\subsystems\persistence\persistence_saving.dm" #include "controllers\subsystems\persistence\persistence_stats.dm" #include "controllers\subsystems\persistence\persistence_storage.dm" -#include "controllers\subsystems\skills.dm" -#include "controllers\subsystems\initialization\chargen.dm" -#include "controllers\subsystems\initialization\fabrication.dm" #include "controllers\subsystems\processing\specifications.dm" #include "datums\extensions\extensions.dm" #include "datums\extensions\holster.dm" @@ -282,6 +282,7 @@ #include "modules\surgery\_surgery.dm" #include "modules\world_save\_persistence.dm" #include "modules\world_save\load_cache.dm" +#include "modules\world_save\save_testing.dm" #include "modules\world_save\saved_vars.dm" #include "modules\world_save\saved_vars\matrix.dm" #include "modules\world_save\saved_vars\saved_icon_states.dm" @@ -294,7 +295,6 @@ #include "modules\world_save\serializers\one_off_serializer.dm" #include "modules\world_save\serializers\sql_serializer.dm" #include "modules\world_save\serializers\sql_serializer_db.dm" -#include "modules\world_save\save_testing.dm" #include "modules\world_save\wrappers\_late_wrapper.dm" #include "modules\world_save\wrappers\_wrapper.dm" #include "modules\world_save\wrappers\_wrapper_holder.dm" diff --git a/mods/persistence/icons/obj/guns/tier2/laspistol.dmi b/mods/persistence/icons/obj/guns/tier2/laspistol.dmi new file mode 100644 index 0000000000000000000000000000000000000000..73694e9f8f60f4f1159b152cc1c3763e4b416ad0 GIT binary patch literal 635 zcmV->0)+jEP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3KBSJijO>MTv_uC9|j)$T#HTOe;#vO@*-GsxnG*6Z7&jQxuZ& zQz~_fbMi~#i{dj9^N@6!5Un!@uTEtJS3ei9R{&v0KPg?t? z!9N16=O^ZQ{7SR?wrwdDDo^m(eZ2I2e^T9RofY6r=Lk>w^F1%4JAHcl>eN}Q=Ntj% zmJ6-58b4VnVM;0EoJ;52v;p2#vpkQSAHC?IXVU@TU9B%Ln@%6U#xLao5*(UUARR|U zayhLAlcpOq*exZ;yudRnAsdvGSR}=95ja<)rDUuILy{557(oRktoxEdB_J{v;Y$c} zXh6Y|sxJZNB;ZTfDUiTL0&sSx01>xSP*70t=YgAO^*bjv1(6nn9J2QQ>CKQ7M4YYn zkEkF^2{@PDKY}TnqMMMj^?nbLju3I81VPinQ4s+t?Lg>9>nJEFD7Yn>jP1}HFfhl& zju8kXFvrA>VWQv3<~!KSNkKpN^8!u^t{g+I0l<0T$}zS>!I1}a4Df$+j$;(u2;Vh} VO$G@%4s-wj002ovPDHLkV1gTU4TAsx literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/guns/tier2/lasrifle.dmi b/mods/persistence/icons/obj/guns/tier2/lasrifle.dmi new file mode 100644 index 0000000000000000000000000000000000000000..46fe5955c702c8def299acbeaf1a3a5f2d114285 GIT binary patch literal 1423 zcmV;A1#tR_P)005u_0{{R3dEt5<0000jP)t-s00014 zT49uzmtQ8zY1AR;G@=Lo~e&6AXyUsq>CHcKrcFcG~FhX4Qo0d!JM zQvg8b*k%9#0H1nPSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1D@x2w zg|OkOGD>q3^YSxO6q52&Ds_u<@=M~2;xiKSkaU_5tuu#gok@ww+2q@(Tb`Mklafl7 z%|%3+pse8P=K_uf0BYcS*xmcb6951NWl2OqRA_!@?w@Ar==rCTyQ+y7=T7@R#n z`(k6Slq<13!}FugvVJ5&g=kqXC8nlH4@Bn6M>Jd(kcQQ9aIY!DSY$bBUwVGj%>q7m zB*-FEfS@*JfDIGiViYejOnI#9&g~3HgwoQ6U*gvDnjwi{G$K3}LL^yLyPLRXlC;Z$ zYVV*F+ud5nG$vs}L{-&0b*v##h7YSK7#-sPY^Y}%3Y1g3m%7fPfET^Wp2WR}C;)}4 ziE$lht3fJ4|rB~sa|0AuVFSG11tcv$HRv{se9BLFWTbV6gisvGa1(_h*z4_J)% z#64jx!JgRmO#zDm8=8N>7ieMM6p)R$a$9cS6tJGQ=j7$(<+YN6WXp!5xCwUF7h#R` zbPK}>n&|0Px^eSvd@$z1$mKLd>kx#=&4w)$;50;l#v(_Gbs~)F7mI5V5uk;xIoFBM zFl;%nw*<5{2%ea&YCwcafx-|{YjwOnl=RaB;W{aZ=HStRH3!>~=Mn8*LL3R2MCj;Z zNaPU~?&WGCLaoR;)eAsd%7-L=bgxR#ZVy7UW&vo+aW7>B5xVDK-_RP+8gP%K`wJrM zx-J5zG@v!$9$93#ABv@247H&7KF@*h!K!|%YU`VomzUT7Bj;|i@)qNeb3^89yWC)C z?eI5dmEkBczn8V5)_R7)L5Q9_vCDA1DL;P@ zBUWMAA6B^LNohY#@tI|HoCN*Mz4PNbh9{>n<{4&wbX0KJ?q^4zNjdrT@#D$ME7Rjs z*pc$5Ji&hb%41;iB@`L%%w~W7d~))O{L3`F1G}@?MVVl&je)U`i7$!*K-p z)mmP(JH;RtA2Bc%F@kChcje?zN=h$ayr>wKhFAH4#Ye8&w#@MEe9q`0r&->`@Qd6( zIRwM8uAFB4w|7yv zs|qRMQX$`cInl+b{9Ve+Ly$5z9KsHzs%k2)vgwzGV`sdopj72R>G$)0bn)N$-;^po zr8GBG{73mE4d?R@x_GyQ;m{ec-%&&&M!fpbnh1U%h!_=y2^otp7A92}d}zgIUuSDS z2}9Oc{A)w3Uv2SkfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSJijO>MTv_uC9|j)$T#HTOe;#vO@**g zRq3V@r!F@!UDtr1(u~sF#Jv2>6osVxluF&=ocxmbqWFx&JS4}M5Un!@uTEtJS3ehU z=l}rZoL1Qa;IXX$00G%aL_t(oh3%L>PQx%1#+|`P-fAT&LSo_s6sV9oQ78y8#fn@h zf`y?GMJ!BQ0WrA}spJbF;1&#UE}XV${5R=>#NgjjfA;gsbB4Yz2EgO_H{jLpo+>Nd zx;;3=(Fn)g{Gd~6AqgfOSm{>M?a}D?>1cTQ{CHAoAvu2~aiv>UKnUCZ5^NckEgtFzSMs@&uvv23_mn zMqv=gj6ozGYS$W(k(cx^1Jtcmwua11KoM=w3c=k+0@M^R#Bq~Wfmb<0+Ef@PO^Pn>d68 z&~a0uI)sKM6ge(?c4ddqbAQa1_W{=Qn>YlpybplZ1e!z090}kcXVAJ*y9IC~9D?%< r-0B{H;uhezsgXNVOAGcIJ)VkRD6nw@={ma600000NkvXXu0mjf)*@L< literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi b/mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5ed36d5fcb70e34acbbab4aaae40401bb78f797c GIT binary patch literal 833 zcmV-H1HSx;P)i?^C?`dUi!&v&s2IpM<_ zQJR~Wm!FxUkd&WNsau?rUlLywpOKh{WP=IOI&+BA33gjoVb z3HksKda(AGH)v1$m<@yw$PSQQsg+jpcR>7M{2Oed`4h$*jxIQ&M*y4*>LE;d;Is8n z@tAe=72~HSNsU_Ed(}WKl~E>!T93oOr|G*Nv-RhnK`B3^=@)BLEo*&+!AfgHUq<_z zQYKPP5U0ty*5d%?xwUx_?fp_>7>3qjqsI}ZB8c|KeS-@y2#;+S=b3dK)0n+v?U1`)=_( z{!)YN+eQeE-&dh9)aUU}bpPuF^`qHB73cbc&R9o}f{6B_{!%*}4u|8v0-f%q25ZPh z=l^aiI$hO`2tJV)-?x0>4{4AmRZa4Sys97L(JDtN@`TRA2V15=poe)MGu1E+kguh@<+aS77@^ASI!g*%NhsW)X00000 LNkvXXu0mjf;QfjZ literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/guns/tier2/revolver.dmi b/mods/persistence/icons/obj/guns/tier2/revolver.dmi new file mode 100644 index 0000000000000000000000000000000000000000..671af8a8f3d9f0057cd611859889019f6ba1f68d GIT binary patch literal 1479 zcmb7^dpy%?7{Gs9RyIvojkKCe`rxCQ$Z?mNvnCdaRGO(=DokcBBc{$m?i}Q>qR|D5y3^E{vTeV@0m^TQxR&?GU=I|tz1Y1jO3_yydc`T{_3c6?V8q7A3S`eZcXi1~PN zspuA(sI~XwWzA$f>NILY;jp0Tlx24NT%+Hw=#20_)L`+{RNYV6D*bc24!)<9MYVs$ zw{iT|>9OZ*=}BJiyZa3edXGY5)MNH#b@+&c%ZVM2FgoSD=0J@}|Q$Xqq62JZu-+O*i&B~l!`J@XR~YOaN7 zyKb6IH9e3@tNb&N!|jvLo9E`p%Bb9j$vuZgyFuD3fve7dZcciLeThrj#!$H);JYawwDZrGTX+4F{ZYiL6Nf(3>Jhl(-_QWy5@a0YIo1!nD2RM9 zPc^6YLIR(tfoPj+s~CVQgAi=jU^1yzVR+I6D|R*uUUvT`Fw2 zQYLMxFJ$Gr6eTClhKrZIP4<@@QTFF`w?#T=U(g^+ie+Lz%rAGKi}oHp5GoA&g)v-{ z(Aul`z+W=jnI$|kQS#W;xH7_ToVb{S^6Tk!*AwJl6};4Hh-nO1E_6`Z%=Z5@vCF@V zC$~|Ra-ccYsY-P)){NsMZ^&BvcB+`CsCTcMUSwBwlnfh*fEuiZTh;Q}@=R}jibA3w zcYWo(L8`RPnN}HGnva}cx{-KgtW<=hTTH4BHmXQsJO=Kyz@>)7DJh z%Im~xpNsHHcEa%1X2%fa(sUU@a7rH?Wd%leJ``o)-P+k$^R%~SAo;fk_SINO*Z5eJ zo4u@r@S`}t#uklLw(WVxrcsYYoK+>q+}k*ZRktJ82oA2%Gp}2W}mJT7`OMUXx!F18%sGvyeIH=E$>( zDl)+DxCDTAT2@Zzi(gU)W?+o1JjF+qv>J&R*1*5eYJ|PDeL5o{ITYcgIC^%$!2W2i zb#5u4ufw{k!1l{1^_&^>sta?L;wH) literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi b/mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4314a75100529432afbedaaa8a47263ca0cf69fd GIT binary patch literal 3862 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 Date: Sun, 31 Dec 2023 15:33:34 -0600 Subject: [PATCH 03/33] Add code for T2 pistol, pocket pistol, and shotgun --- .../guns/projectile/tier0/pistol.dm | 2 +- .../guns/projectile/tier2/pistol.dm | 23 ++++++++++++++++ .../guns/projectile/tier2/pistol_pocket.dm | 27 +++++++++++++++++++ .../guns/projectile/tier2/shotgun_pump.dm | 24 +++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier2/pistol.dm create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm index e9e9f27af80..96d2629442b 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm @@ -6,7 +6,7 @@ force = 5 accuracy = 0 one_hand_penalty = 2 - origin_tech = "{'combat':3,'engineering':2,'materials':2}" + origin_tech = "{'combat':2,'engineering':1,'materials':1}" caliber = CALIBER_22LR ammo_indicator = FALSE w_class = ITEM_SIZE_NORMAL diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol.dm new file mode 100644 index 00000000000..8268ae2a6c3 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol.dm @@ -0,0 +1,23 @@ +/obj/item/gun/projectile/pistol/advanced + name = ".45 'Paco' HG" + desc = "Pistol of modern design. Highly accurate, and boasts a reduced fire delay compared to earlier models. Chambered in .45." + icon = 'mods/persistence/icons/obj/guns/tier2/pistol.dmi' + caliber = CALIBER_45 + fire_delay = 3 + force = 5 + accuracy = 2 + one_hand_penalty = 1 + origin_tech = "{'combat':4,'engineering':3,'materials':4}" + ammo_indicator = FALSE + w_class = ITEM_SIZE_NORMAL + magazine_type = /obj/item/ammo_magazine/fortyfive/advanced + allowed_magazines = /obj/item/ammo_magazine/fortyfive + material = /decl/material/solid/metal/titanium + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) + +/obj/item/gun/projectile/pistol/advanced/empty + starts_loaded = FALSE \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm new file mode 100644 index 00000000000..ab551bfb387 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm @@ -0,0 +1,27 @@ +/obj/item/gun/projectile/pistol_pocket/advanced + name = ".22LR 'Triple-Threat' HG" + desc = "Pistol of modern design. Small enough to store in pockets, and possesses both semi-automatic and three-round burst fire modes. Chambered in .22LR." + icon = 'mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi' + fire_delay = 2 + force = 5 + accuracy = 1 + one_hand_penalty = 0 + origin_tech = "{'combat':4,'engineering':4,'materials':4}" + caliber = CALIBER_22LR + ammo_indicator = FALSE + w_class = ITEM_SIZE_SMALL + magazine_type = /obj/item/ammo_magazine/twentytwolr/advanced + allowed_magazines = /obj/item/ammo_magazine/twentytwolr + material = /decl/material/solid/metal/titanium + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) + firemodes = list( + list(mode_name="semi-automatic", burst=1, fire_delay=2, one_hand_penalty=0, burst_accuracy=null, dispersion=null), + list(mode_name="3-round bursts", burst=3, fire_delay=2, one_hand_penalty=1, burst_accuracy=list(1,0,-1), dispersion=list(0.0, 1.6, 2.4, 2.4)), + ) + +/obj/item/gun/projectile/pistol_pocket/advanced/empty + starts_loaded = FALSE \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm new file mode 100644 index 00000000000..6d42fe81899 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm @@ -0,0 +1,24 @@ +/obj/item/gun/projectile/shotgun/pump/simple + name = "12g 'Gladdy' SG" + desc = "Pump-action shotgun of modern design. Possesses an increased ammunition capacity and shorter fire delay compared to earlier models . Chambered in 12 gauge." + icon = 'mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi' + max_shells = 7 + fire_delay = 8 + w_class = ITEM_SIZE_HUGE + force = 10 + slot_flags = SLOT_BACK + caliber = CALIBER_12G + origin_tech = "{'combat':4,'engineering':3,'materials':4}" + load_method = SINGLE_CASING + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/advanced + handle_casings = HOLD_CASINGS + one_hand_penalty = 10 + material = /decl/material/solid/metal/titanium + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) + +/obj/item/gun/projectile/shotgun/pump/simple/empty + starts_loaded = FALSE \ No newline at end of file From 0f7b9209ad6aa46674ff9b212496ab1b47c31329 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, 31 Dec 2023 15:33:53 -0600 Subject: [PATCH 04/33] Oopsy-poopsy --- .../modules/projectiles/guns/projectile/tier2/shotgun_pump.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm index 6d42fe81899..c5a67109487 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/shotgun_pump.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/shotgun/pump/simple +/obj/item/gun/projectile/shotgun/pump/advanced name = "12g 'Gladdy' SG" desc = "Pump-action shotgun of modern design. Possesses an increased ammunition capacity and shorter fire delay compared to earlier models . Chambered in 12 gauge." icon = 'mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi' @@ -20,5 +20,5 @@ /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE ) -/obj/item/gun/projectile/shotgun/pump/simple/empty +/obj/item/gun/projectile/shotgun/pump/advanced/empty starts_loaded = FALSE \ No newline at end of file From de8842ad0cae700c7fdf86bddbbcd0111f110886 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, 31 Dec 2023 17:33:17 -0500 Subject: [PATCH 05/33] Add .357 caliber, SMG code (no sprites yet), T2 .22LR ammo (sprites AND code) --- .../icons/obj/ammunition/357/tier0.dmi | Bin 0 -> 514 bytes .../icons/obj/ammunition/357/tier1.dmi | Bin 0 -> 530 bytes .../icons/obj/ammunition/magazines.dmi | Bin 2890 -> 3850 bytes .../projectiles/ammunition/22_LR/magazines.dm | 28 +++++++- .../projectiles/ammunition/357/bullets.dm | 34 +++++++++ .../projectiles/ammunition/357/magazines.dm | 66 ++++++++++++++++++ .../projectiles/guns/projectile/tier2/smg.dm | 4 ++ 7 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 mods/persistence/icons/obj/ammunition/357/tier0.dmi create mode 100644 mods/persistence/icons/obj/ammunition/357/tier1.dmi create mode 100644 mods/persistence/modules/projectiles/ammunition/357/bullets.dm create mode 100644 mods/persistence/modules/projectiles/ammunition/357/magazines.dm create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier2/smg.dm diff --git a/mods/persistence/icons/obj/ammunition/357/tier0.dmi b/mods/persistence/icons/obj/ammunition/357/tier0.dmi new file mode 100644 index 0000000000000000000000000000000000000000..837af305143a9b26e08160b11f90f38d710dadcf GIT binary patch literal 514 zcmV+d0{#7oP)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^0002>Nklchp*lynmmv#k{`OH#aVOK!YVAYJVxdIc2(!Fs*Q@~9VWn9oC z-enmZ^c6Q6T(tXcs??QFq7BPl*&(1JUNE}ztS_hqvaR+F9mI(gFvLCB2@oYWD}nlx zSqczY3IG5A_<6*AKQ!I1Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1oryC$&V0i!&v& zs2C_^$iV|cK`qZ z07*naR9J=Wm@x{%KoCVIO(Y3|Q9B#a#!`(3@DdA_wpv+R2{sFhU~QF3F{Ka)EZ)K1 zJ9q}MGCP4?WUvYIs{G0P&nL|;0buGy+@krt!HgEr9(IWZCbR(P#B*AJM=St9EPxQg z)cyu7V2zQ|)InB30lw{JBocME`|ae#zUL@lCpswNKceDEDge+VeSr_e0u1Bg4HL5~ U40M9kDgXcg07*qoM6N<$f_$stYybcN literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index 269d93b83d167e073b870cd6fe95244c6a81ef00..e4cb91f0120f17992dc65bd2fd924e2ea066f9c3 100644 GIT binary patch literal 3850 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 diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm index 8f88b889a74..72995267986 100644 --- a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm @@ -63,4 +63,30 @@ /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 + ammo_type = /obj/item/ammo_casing/twentytwolr/simple + +/obj/item/ammo_magazine/twentytwolr/advanced + name = "advanced .22LR magazine" + desc = ".22LR magazine of modern design. Good capacity, and can be used well with both handguns and submachine guns alike." + icon_state = "22lr2" + origin_tech = "{'combat':3}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_REINFORCEMENT + ) + ammo_type = /obj/item/ammo_casing/twentytwolr/advanced + max_ammo = 20 + +/obj/item/ammo_magazine/box/twentytwolr/advanced + name = "packet of advanced .22LR rounds" + desc = "Container of modern design intended for holding loose .22LR rounds." + icon_state = "box_22lr2" + origin_tech = "{'combat':3,'materials':3}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twentytwolr/advanced \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/357/bullets.dm b/mods/persistence/modules/projectiles/ammunition/357/bullets.dm new file mode 100644 index 00000000000..447f9c70955 --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/357/bullets.dm @@ -0,0 +1,34 @@ +#define CALIBER_357 ".357" + +/obj/item/ammo_casing/threefiftyseven + name = "generic .357 round" + desc = "An unsettlingly generic .357 round." + icon = 'mods/persistence/icons/obj/ammunition/357/tier1.dmi' + caliber = CALIBER_357 + projectile_type = /obj/item/projectile/bullet/threefiftyseven + +/obj/item/projectile/bullet/threefiftyseven + fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' + damage = 30 + distance_falloff = 1 + +/obj/item/ammo_casing/threefiftyseven/handmade + name = "makeshift .357 round" + desc = ".357 round of dubious origin. Sports poor range and poor armor penetration due to shoddy construction." + icon = 'mods/persistence/icons/obj/ammunition/357/tier0.dmi' + projectile_type = /obj/item/projectile/bullet/threefiftyseven/handmade + +/obj/item/projectile/bullet/threefiftyseven/handmade + damage = 40 + distance_falloff = 6 + +/obj/item/ammo_casing/threefiftyseven/simple + name = "standard .357 round" + desc = ".357 round of ancient design. Sports mediocre range due to unimpressive velocity." + icon = 'mods/persistence/icons/obj/ammunition/357/tier1.dmi' + projectile_type = /obj/item/projectile/bullet/threefiftyseven/simple + +/obj/item/projectile/bullet/threefiftyseven/simple + damage = 50 + distance_falloff = 4 + penetration_modifier = 0.9 \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm new file mode 100644 index 00000000000..505494cadb7 --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm @@ -0,0 +1,66 @@ +/obj/item/ammo_magazine/threefiftyseven + name = "generic .357 speedloader" + desc = "An unsettlingly generic .357 speedloader." + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + icon_state = "3571" + mag_type = SPEEDLOADER + caliber = CALIBER_357 + material = /decl/material/solid/metal/steel + ammo_type = /obj/item/ammo_casing/threefiftyseven + initial_ammo = 0 + max_ammo = 0 + multiple_sprites = 1 + +/obj/item/ammo_magazine/box/threefiftyseven + name = "packet of generic .357 rounds" + desc = "A packet of unsettlingly generic .357 rounds." + icon_state = "box_3571" + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + material = /decl/material/solid/metal/steel + caliber = CALIBER_357 + ammo_type = /obj/item/ammo_casing/threefiftyseven + max_ammo = 12 + +/obj/item/ammo_magazine/threefiftyseven/handmade + name = "makeshift .357 speedloader" + desc = ".357 speedloader of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship." + icon_state = "3570" + origin_tech = "{'combat':1}" + material = /decl/material/solid/plastic + ammo_type = /obj/item/ammo_casing/threefiftyseven/handmade + max_ammo = 3 + +/obj/item/ammo_magazine/box/threefiftyseven/handmade + name = "packet of makeshift .357 rounds" + desc = "Container of dubious origin intended for holding loose .357 rounds." + icon_state = "box_3570" + 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/threefiftyseven/handmade + +/obj/item/ammo_magazine/threefiftyseven/simple + name = "standard .357 speedloader" + desc = ".357 speedloader 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/threefiftyseven/simple + max_ammo = 4 + +/obj/item/ammo_magazine/box/threefiftyseven/simple + name = "packet of standard .357 rounds" + desc = "Container of ancient design intended for holding loose .357 rounds." + icon_state = "box_3571" + 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/threefiftyseven/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/smg.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/smg.dm new file mode 100644 index 00000000000..8c73598bf6e --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/smg.dm @@ -0,0 +1,4 @@ +/obj/item/gun/projectile/automatic/smg/advanced + name = ".22LR 'Junior' SMG" + desc = "Submachine gun of modern design. Accurate, and boasts both semi-automatic and fully automatic firing modes. Chambered in .22LR." + caliber = CALIBER_22LR From f92e035ffa617b35447adb5e4d0f61bb0d91cd4c 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, 31 Dec 2023 17:51:31 -0600 Subject: [PATCH 06/33] Add T2 revolver, make T1 revolver use .357, add T2 SMG, add T2 .22LR bullets+proj --- .../icons/obj/ammunition/22lr/tier2.dmi | Bin 0 -> 476 bytes .../projectiles/ammunition/22_LR/bullets.dm | 12 +++++++- .../guns/projectile/tier1/revolver.dm | 14 ++++----- .../guns/projectile/tier2/revolver.dm | 22 ++++++++++++++ .../projectiles/guns/projectile/tier2/smg.dm | 28 +++++++++++++++++- 5 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 mods/persistence/icons/obj/ammunition/22lr/tier2.dmi create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier2/revolver.dm diff --git a/mods/persistence/icons/obj/ammunition/22lr/tier2.dmi b/mods/persistence/icons/obj/ammunition/22lr/tier2.dmi new file mode 100644 index 0000000000000000000000000000000000000000..40e45074fdf17fe8bf54502305a4e7f9aaaf80ac GIT binary patch literal 476 zcmV<20VDp2P)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^0002bNkltE|>l2=% zL5`6OHY8s@aR?!V5b}w}hUfR*;tB)$iHe!qAb-fZG^pr%A{=FzdE|tUpW_YtwHrIy SgbE`70000 Date: Sun, 31 Dec 2023 18:04:37 -0600 Subject: [PATCH 07/33] Add T2 .357 ammo + mags --- .../icons/obj/ammunition/357/tier2.dmi | Bin 0 -> 515 bytes .../icons/obj/ammunition/magazines.dmi | Bin 3850 -> 4174 bytes .../projectiles/ammunition/357/bullets.dm | 13 +++++++- .../projectiles/ammunition/357/magazines.dm | 28 +++++++++++++++++- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 mods/persistence/icons/obj/ammunition/357/tier2.dmi diff --git a/mods/persistence/icons/obj/ammunition/357/tier2.dmi b/mods/persistence/icons/obj/ammunition/357/tier2.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fe22ead0f9e8228f915caf1183e0f943968a2ee6 GIT binary patch literal 515 zcmV+e0{s1nP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSJijO>MTv_uC9|j)$hY9)Oe;#vO$D(H z(NyUsmFDE6mLL=xVpp7*SC*Prl3!FwvIbl#l@(n5T)^G~017}ufnu+_|z4v;%)w~Kp2q_m*>blZ_0nk-6P)gUev97&|uG`QTX=*lzhR}~Nf`u9u zhToH`)2qC0o1gou^!TRK8 z5F9U#2{!sK#Q#Ug@+y_Rza8=ce3_`Cxi{Cnp&2*A&}MKu7xx0G)ZJ#VGZ@SdDzzFI z@Z~LBIGh)8(qFm+5dI*{>{BL^hf@F{>P|QC!Z83LHl9v4ChI^8^%DR9002ovPDHLk FV1f@{+p7Qo literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index e4cb91f0120f17992dc65bd2fd924e2ea066f9c3..d3ba19924b40fe75d51e3be39d96c4dec72dd718 100644 GIT binary patch delta 3972 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 boDQwj((>I%TR6t~MT6{ZE}Ut!@=5t0S0EVS delta 3666 zcmZ8kdpwhU8=upVuujeyZ*r(aR3q9rvPB{Jod^YO{l>}Dgh#FG^jTp zn#>c0gwe2SikY&l9o{`}@8R=#|M^|l@BUub{rTM2_ji4N*G)ILuAif+22zp(fj~wa z?^LO&{BwH&(An8(io!x~b^pWCj?g`B6F@2&h{Q=znRv9D2gqSzJV@$euADj>?-Us4 z9~%-K9}*P_0%0jdcLpMfmXO0^%UevnJobQZo!)=CWCv+Mv*f}332MI?)ni& z8&7AA?Sq|vf=hFV-#wf^EnHwZ6>|%>U4QqFf}>hD&z0)YVqeO}8BEIQ2a*bJ?)pej zn-ir0tIpH+qq0+46!~es2f=GC`3LMK*j3lG>8($AsoZb#gZrn7Lsslq_l_K}AZrAo zOHR0wV^^DK2b-?%9&7a(+4kjRwEg65%evKaj_FRe*OPrpC82-4o+DhiP@}IRxmCX9 zf>xcu@j~|qh3>!nhjP4QWew9AXC8cdvqL{p;tHHKZs{3CdEsrRe`nd3H?faS}=*%|lL!_X-_r))!i`Evu zKz{}7Y9m6r?%lZMREBy~Pr7a6M7;vt zlNvyv{XqH1m+)&r$tFfrN*kgBX$Au$Pss-0V$@1D8hm;`O&u#H6T7zOf^G&M zC%78R=usi9uG$huwX3_@Ko4+M_ceix8x^HAFDGFcAKjaq($Qmp*z!PW4e{JeX|CAN zq;e3o?~$ow#GdS}idAuCPt2QC3B~LQzWSW!p=rXK1sOBKQ1GIh9vbqd>Y7MRH|21= zBq#Q9mr2Grrff2_)7u?=`kh5*teVb>2HA#0Mwr1=I;-n+Fb0n8`6<3kK*i}**5P4l zKJ`4o6DymFi%~c?EB%_!2f|>F>W|{~yg269n$cUz4zDZD^;O`|XXeYsF7}iDfFM>_sO01`5%|TnnCzE#dPYt} zt+T<8EL4OD%|a9RScuGK8sAS8)Qek{bCyH%pji0g2iHgR4j{=v+#?Liqk_@#t+yxR z#e;y%q@bmvEdm2{02^wWg{P+bcfL=NK=32;6-}!mS6ti-BDF=J6t;mw)!;r)E`%M) zgGR{?w@E|d+J>@WGGkXIhW0UOdyEgSRZ51-4RWBH{R|XL&!-&L>hK-B%;)Ir#jy~n zAB9?3qrh6Kq)ur*T|w)pY_lxM5}&m1UX>4Cs0{ipR9t@Nxj$d{fPJ+_(tKGgml%82 z0ZGnZ*SN=~{alr$#PMEp?chK?p7=&hN`Edx`tLTO8_1%%(QLasE49%cwn)h7}45jPO!eRrH5XpZ}2W z?;djfkI~5w2MkJ(kb%4G22slLPgpnaGht!>DPl34(hT3*V8-GmxV!;CPL zyil!#f1D$By?1v9_Dkbyj2_4GaHbyxsO@hsYSA@7CV{PH#~_PMvID zOQ3*0j;Af0!i7b50y~waHA0%XESF>v!>HmDvS*smX>j(C(8c!BE0tHHZjI}5X>1e? zDebt8-gdKa00N-l%Uk4Q)i}lhj%wb=`@)gy8SZ*7a+K>8_E2spzQt@$oeW1U?>XaN zl&Z=&%IgXDbdWPx^h};rxt7au+d!hAe>K_K^if&nLXdYa%($t z#QV|u=L_9pc!Us;(fp3v|7GF8sPPc@OOG7Q+QbU)(i=r8F>UZBqbLMsX_$49TVB2P z*S~(UjjeiLM$HC1EOFR6Q7Gedt&#UR^r`|=RGHQ)dX&9ZsuBCR+^{yIWsBo8oMtT0 z;Fxh|$x$tIAye1w@|-~)s$HAnnXZxz3F58 zsjc5ov~LllO3LHNoY?#g|bBygGHO@YTL4}T*Y&CJ{o09)2inEX6NFTg2Nffy>RxN#48?w~_AUF(l zZp~!&r*pH|wx6j^NciEBfzXCskxZZHv=f6Gr!ZN_H&k+iMVn!nPBIQF)a0J7Hw2D#}qT!Ve+E%jbp2ny8PWcH?V%0Ad?11HqjzP z#AK2{9f|*3E;5UQYxVzHMOg`W8)`ob5$SQ&5_cJq|EMYIF1Kq~kDjoOHOV^<;Nb#u z9SLwwa-Z@Iaq5XmKD66o0rxci?iv1GN*r^E%N@fkP+3fDB{flv)gl!3yLB;u%Cn{R zfpo?CC91tNsNu&xI{@`}4XuY{+Xu3XK*PYLtd(cwLyE`PlWl;kEe!9C8R6UQSCU3p z;d7vXW3IEjSnR5i`zLH5|@t75;lJzkh^vwi);ETy_ypV5wWmVmj zTEJJf3Sed;LKa_Ua!4C(xn&iNyo+$-P5Gz_KC>l(>S!&6JNSRY{q=QPD&Mu^ILsmL zt)qTm?m%8PHD?Th=vcAD69r2)my;rKSP{t_4n*QxumRN9*ZC~3lQXTa{qO@16F2dE z5A}TEL;%8|p4fn_RV}D5unHN_=f-hf!TqrpM%B9t2fzz?EGSO5Y<`XhLCsgpM`opF zp{l5GE>ZfvTAX+Bq_A_o?5<(!D-XtzuQvN+W-j3m+_R|Y{n5nX9CH6Ps6OiaWh&Sv z5-*E4_~=mhWU?XK#_dh9X1dUQEc+mS5A_3(w9s!WbQ;Om?hZQ|9STmu(tQv=d687* z*}*{YzE}(00KDDJEJj|OG(oK41zkT>&>ZP|99*xtBvfl$TS0U-v9}3-gb4&~O$kZS zlXErtS#_E=)gSG;YgjeG^_W+NX{D>%6Zu*EaN*9xi(18+^OdIMKL6$j_-%I-wBs@d z(yJ{n9k(>fC{hIpLZ6+bXcv)CPdaMIhs}a}-}hVMtjq>t;m%v#@}=z28Rln&QF`=O z2lM)@J2@}q<8PKDX+;Q2-peR=n)U~Q*2S!7d$0eSTr1|k`Y-S6=E$!nRLW=YCV;oq$V??`B^Ds}5gl=>xNjk$A@8S#VG^xhxVF@Q>)h8cjS zA3KMrf7zxN*l9202*;X>UmTlRI&1{T8kk?c-g|n-?XQdqiCjcO W(<94hk4fooA;{&hn^U!;AK{ Date: Sun, 31 Dec 2023 18:13:46 -0600 Subject: [PATCH 08/33] Add T2 .45 ammo and mags --- .../icons/obj/ammunition/357/tier2.dmi | Bin 515 -> 515 bytes .../icons/obj/ammunition/45/tier2.dmi | Bin 0 -> 488 bytes .../icons/obj/ammunition/magazines.dmi | Bin 4174 -> 4296 bytes .../projectiles/ammunition/45/bullets.dm | 13 +++++++- .../projectiles/ammunition/45/magazines.dm | 28 +++++++++++++++++- 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 mods/persistence/icons/obj/ammunition/45/tier2.dmi diff --git a/mods/persistence/icons/obj/ammunition/357/tier2.dmi b/mods/persistence/icons/obj/ammunition/357/tier2.dmi index fe22ead0f9e8228f915caf1183e0f943968a2ee6..27119278334513634204b7dcd9345ef3c09cc994 100644 GIT binary patch delta 267 zcmV+m0rdWZ1cL;y0s()a4#F@LMH>iPCJ;^d01Rjp8qs715)^uYfM2p?g76(=1HmUC za3HXR2^_ye5G3@%T9z8bJ?_5udUsdzDg+_qzmQVbwH^$BuA_lcx^6_e_NKb-LSLk* z*=2q8b?VIczDhXStm321K)1|8i0XgGg^58BrI#}lUweam@5 z2qAw)knP+IHYYcO;COLNu+@Jdt{x$OSE(FSc6blq%S4sUy}0fT&A1hYHiP0^-V3Bs zH=99bFjyW`YBez6%OYGkoELF2T)PAi{wU1tQznwTQve~FPB-wxF#sVp9tqGU+9#i_ RjsO4v07*qoM6LruV1nMPZm$3U delta 267 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 MTgTH?r+gCs2M-(}O8@`> delta 3875 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 Date: Sun, 31 Dec 2023 19:45:42 -0500 Subject: [PATCH 09/33] Add T2 5.56 ammo + mags + boltaction rifle --- .../icons/obj/ammunition/5.56/tier2.dmi | Bin 0 -> 182 bytes .../icons/obj/ammunition/magazines.dmi | Bin 4296 -> 4778 bytes .../icons/obj/guns/tier2/boltaction.dmi | Bin 0 -> 1565 bytes .../projectiles/ammunition/5.56/bullets.dm | 13 ++++++++- .../projectiles/ammunition/5.56/magazines.dm | 26 +++++++++++++++++ .../guns/projectile/tier2/boltaction.dm | 27 ++++++++++++++++++ 6 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 mods/persistence/icons/obj/ammunition/5.56/tier2.dmi create mode 100644 mods/persistence/icons/obj/guns/tier2/boltaction.dmi create mode 100644 mods/persistence/modules/projectiles/guns/projectile/tier2/boltaction.dm diff --git a/mods/persistence/icons/obj/ammunition/5.56/tier2.dmi b/mods/persistence/icons/obj/ammunition/5.56/tier2.dmi new file mode 100644 index 0000000000000000000000000000000000000000..cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;m;-!5T!HlRD%)E?im@cfFPOpM z*^M-ilB$r15|`BC)e_1!5cyiE*d|0 zq;uX!^CUx2Pwx&3;~?Y9#$F0CsjT7l;v3i)KHlcf^{%~V4K$R;)5S4_V`g%K#2p}S W0R!VxY5#RV7K5j&pUXO@geCygCOLEf literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index 78127d570a116085f1230fbe852f2e05e7e7b5a9..ce3753ddac72fa971e066c81a0a7dd491cad0e94 100644 GIT binary patch literal 4778 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 literal 4296 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 diff --git a/mods/persistence/icons/obj/guns/tier2/boltaction.dmi b/mods/persistence/icons/obj/guns/tier2/boltaction.dmi new file mode 100644 index 0000000000000000000000000000000000000000..0c3a4d3f053394ac0fc933e19e70ab7962698f6b GIT binary patch literal 1565 zcmV+&2IBdNP)005u}0{{R3yb+fl0000yP)t-sz`(#z zRb-Bjm@qX)yT!*KCNM2AJXKj^KY77?wAnR2dy|x#7#JeV%+xnFLX?-7!oi?^C?`dU zi!&v&s2IpMUbk(h^M zi3!m)mdF(D~2IUAQgWd&D17jTRL0DLZpeeR2g_y7O|+et)0 zRCt{2oQ;y(Dh!1q6sTi2cHH-W*a9YA+erL4X~NvAZ>BpbGUBWNr#Z#BTm(T71mSG} zfU*FbjQ?{$;nkuj0V)&!42a;sI09FdjDHS|_%r@S3S{E{9=pEW3Ik$zRi%4Hqb*24hd8|X(+!t`l>@zfTdmGFSS<)>ULAgE(};__)-)1XtzS+qA&vOKC?fFDe}Xi z*(*foIyZH`FvQro_@YmlVtsBd>=dg=p>KEdsP|Lo1^9_0_fams=p$x~7l>RR8!_&7 zu?si>?hS(5<_2J^dKpH=wV4CKB#6xZ(3WS(67 zaxY$d5#~-dbH!~3wzv(!6ju-gK@bE%5Cp+PeWuA8XvMsmD7K(H>TL?iL=~U&A`5DH zed~$^GJ`#vsYK2rElz*1pcaSy;ys8G=n2^Pv_vBBkroTwTTr&Ib^{jAaO44QG$=aJ z;*pjLJX%nwowuZlJ^#o9+-UG7A!P$P%cfM|(SmaRpsQ=Cz{msKXaFWrl}CEnTTsu} zrBfVxfIAIjnmUhk>GAAP?+->EU{*t=N4oS07St(!kQgwf;haYrEU0t-VB`U&G@SKF zU*g~aCN;d^k-o&%1N@c-K@bE%5ClOGn!+C+d+m(sk|J)-CN3Hq)XQg7!Jk5mn{6wm z1s08sKgZj~pVpDNnoWWGKI7U-G9HJfnI7ZgF^$@tT%4zAo*vK0W18*HdA;&MbzhUX z1oO7L>p#ti+~-~wc5&2toE}!i#9TPL(~I^x`*R-0KjT^h`8u_)~7~bfwPEDfW98%I3h3gzP_V&TLZiIQntD0$=)FdQi);(we0P zH+4KH38hKW8(~SXOON1P>tcOw&0}{sN(!C3MT`YWa$dVju}`nDj}O(R(YoI+dY_{# zNuM`559w>wQN3z%6kU2wlpqL#APD~fnm=Sdd|SY2hSqBfjXVRvs(>~oe_;P#-Lz3a zR)$VnBcFmVQ|kiVsg#c@VPJQHU4rk~B&Q9)a2=<@pX+%|S{UK10T{011y-GXN*E#a z2H-&;eV?%c(^LH8=Xp19;$1-20Mxv@GIQ34B_6IW~`z z(*~dp-rmtWED~t-aiP`P%TRF9qWkC_9+c2AGu+t(9KhtY^rPTyywQ1X#4%*uGvB}P4S-ky+JAXK zBVg=i+m?o=SP%q3_+N8x!{K3R#UkSofv?i|chxwHr)h=e+u!b&!F{G}S)l*SJ+wQ= zizh&RVAm` literal 0 HcmV?d00001 diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm index 1d4a139b9c0..0c4dc44019a 100644 --- a/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm +++ b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm @@ -32,4 +32,15 @@ /obj/item/projectile/bullet/fivefiftysix/simple damage = 45 distance_falloff = 2 - penetration_modifier = 0.8 \ No newline at end of file + penetration_modifier = 0.8 + +/obj/item/ammo_casing/fivefiftysix/advanced + name = "advanced 5.56x45mm round" + desc = "5.56x45mm round of modern design. Sports great armor penetration capabilities, but most firearms which use it are bulky." + icon = 'mods/persistence/icons/obj/ammunition/5.56/tier2.dmi' + projectile_type = /obj/item/projectile/bullet/fivefiftysix/advanced + +/obj/item/projectile/bullet/fivefiftysix/advanced + damage = 55 + distance_falloff = 1 + penetration_modifier = 0.7 \ 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 index 13c07dcd20d..92a46a8b1ad 100644 --- a/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm @@ -63,4 +63,30 @@ /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) + ammo_type = /obj/item/ammo_casing/fivefiftysix/simple + +/obj/item/ammo_magazine/fivefiftysix/advanced + name = "advanced 5.56x45mm magazine" + desc = "5.56x45mm magazine of modern design. Good capacity compared to earlier models." + icon_state = "5562" + origin_tech = "{'combat':3}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_REINFORCEMENT + ) + ammo_type = /obj/item/ammo_casing/fivefiftysix/simple + max_ammo = 30 + +/obj/item/ammo_magazine/box/fivefiftysix/advanced + name = "packet of advanced 5.56x45mm rounds" + desc = "Container of modern design intended for holding loose 5.56x45mm rounds." + icon_state = "box_5562" + origin_tech = "{'combat':3,'materials':3}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) ammo_type = /obj/item/ammo_casing/fivefiftysix/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/boltaction.dm new file mode 100644 index 00000000000..42d43aa00a1 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/boltaction.dm @@ -0,0 +1,27 @@ +/obj/item/gun/projectile/bolt_action/advanced + name = "5.56x45mm 'Deadshot' BA" + desc = "Bolt-action rifle of modern design. Accurate, and comes with a built-in 2x scope alongside an increased ammunition capacity compared to earlier models. Chambered in 5.56x45mm." + icon = 'mods/persistence/icons/obj/guns/tier2/boltaction.dmi' + force = 10 + slot_flags = SLOT_BACK + origin_tech = "{'combat':4,'engineering':4,'materials':3}" + caliber = CALIBER_556 + handle_casings = HOLD_CASINGS + load_method = SINGLE_CASING + max_shells = 7 + w_class = ITEM_SIZE_HUGE + ammo_type = /obj/item/ammo_casing/fivefiftysix + one_hand_penalty = 10 + fire_delay = 10 + accuracy = 2 + scoped_accuracy = 5 + scope_zoom = 2 + material = /decl/material/solid/metal/titanium + matter = list( + /decl/material/solid/metal/steel = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) + +/obj/item/gun/projectile/bolt_action/advanced/empty + starts_loaded = FALSE \ No newline at end of file From 3dc1f091d4ab5ad24adfd414f4b304845e96bb83 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, 31 Dec 2023 18:58:58 -0600 Subject: [PATCH 10/33] Add T2 12g slugs and buckshot --- .../obj/ammunition/12g/tier2_buckshot.dmi | Bin 0 -> 467 bytes .../icons/obj/ammunition/12g/tier2_slug.dmi | Bin 0 -> 460 bytes .../icons/obj/ammunition/magazines.dmi | Bin 4778 -> 5341 bytes .../projectiles/ammunition/12g/bullets.dm | 26 +++++++++++++++- .../projectiles/ammunition/12g/magazines.dm | 28 +++++++++++++++++- 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 mods/persistence/icons/obj/ammunition/12g/tier2_buckshot.dmi create mode 100644 mods/persistence/icons/obj/ammunition/12g/tier2_slug.dmi diff --git a/mods/persistence/icons/obj/ammunition/12g/tier2_buckshot.dmi b/mods/persistence/icons/obj/ammunition/12g/tier2_buckshot.dmi new file mode 100644 index 0000000000000000000000000000000000000000..814113fec992c0bf606699c54a4ee9f683a3c936 GIT binary patch literal 467 zcmV;^0WAKBP)bVOxyV{&P5bZKvH004NLQ&wYC`008RfCdOIUR2KjM0L)25K~!jg?b%BX z!ypUIQBrTBd0U%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 JPDHLkV1lcY%7_2} literal 0 HcmV?d00001 diff --git a/mods/persistence/icons/obj/ammunition/12g/tier2_slug.dmi b/mods/persistence/icons/obj/ammunition/12g/tier2_slug.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3f3010f8108e4678b12fc655fd5c02f96ed75acd GIT binary patch literal 460 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 N)Nxm*I)`h?{{zSr!72a% delta 4687 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 qcHBX4Pono%nwkB88;@ diff --git a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm index 6aa5e19889b..2703220f0a3 100644 --- a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm +++ b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm @@ -79,4 +79,28 @@ pellets = 6 range_step = 1 spread_step = 10 - penetration_modifier = 1.3 \ No newline at end of file + penetration_modifier = 1.3 + +/obj/item/ammo_casing/twelvegauge/slug/advanced + name = "standard 12g slug shell" + desc = "12g slug shell of modern design. Sports good armor penetration capabilities and very high damage, but suffers from unimpressive range." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier2_slug.dmi' + projectile_type = /obj/item/projectile/bullet/twelvegauge/advanced + +/obj/item/projectile/bullet/twelvegauge/advanced + damage = 70 + distance_falloff = 4 + penetration_modifier = 0.85 + +/obj/item/ammo_casing/twelvegauge/buckshot/advanced + name = "standard 12g buckshot shell" + desc = "12g buckshot shell of modern design. Sports incredibly high damage, but suffers from poor armor penetration and poor range." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier2_buckshot.dmi' + projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/advanced + +/obj/item/projectile/bullet/pellet/twelvegauge/advanced + damage = 20 + pellets = 6 + range_step = 1 + spread_step = 8 + penetration_modifier = 1.25 \ 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 index 80b02aba78c..98259a0cf59 100644 --- a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm @@ -64,4 +64,30 @@ /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 + ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple + +/obj/item/ammo_magazine/box/twelvegauge/slug/advanced + name = "packet of advanced 12g slug shells" + desc = "Container of modern design intended for holding loose 12g slug shells." + icon_state = "box_12g2_slug" + origin_tech = "{'combat':3,'materials':3}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/advanced + +/obj/item/ammo_magazine/box/twelvegauge/buckshot/advanced + name = "packet of advanced 12g buckshot shells" + desc = "Container of modern design intended for holding loose 12g buckshot shells." + icon_state = "box_12g2_buckshot" + origin_tech = "{'combat':3,'materials':3}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/advanced \ No newline at end of file From a8262e1bf32bf70e019c204e686c18861ba418fe 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, 31 Dec 2023 19:05:02 -0600 Subject: [PATCH 11/33] Add T2 laser rifle and laser pistol --- .../guns/energy/tier2/laspistol.dm | 19 +++++++++++++++++++ .../projectiles/guns/energy/tier2/lasrifle.dm | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm create mode 100644 mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm diff --git a/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm b/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm new file mode 100644 index 00000000000..556e918dc51 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm @@ -0,0 +1,19 @@ +/obj/item/gun/energy/laser/pistol/advanced + name = "Laser 'Martin' EG" + desc = "Laser pistol used by modern high-tech military groups. Compact, quick-firing, and boasts acceptable charge capacity due to advanced construction. Fires Alpha-type laser beams." + icon = 'mods/persistence/icons/obj/guns/tier2/laspistol.dmi' + slot_flags = SLOT_LOWER_BODY + w_class = ITEM_SIZE_NORMAL + one_hand_penalty = 0 + max_shots = 12 + fire_delay = 3 + force = 3 + origin_tech = "{'combat':4,'magnets':3,'engineering':4,'materials':3}" + projectile_type = /obj/item/projectile/beam/smalllaser + material = /decl/material/solid/metal/titanium + matter = list( + /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/gold = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE + ) \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm new file mode 100644 index 00000000000..986c2ecb1d8 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm @@ -0,0 +1,19 @@ +/obj/item/gun/energy/laser/rifle/simple + name = "Laser 'Frontrunner' EG" + desc = "Laser rifle used by modern high-tech military groups. Powerful compared to previous models of laser weapons, and boasts decent charge capacity. Fires Beta-type laser beams." + icon = 'mods/persistence/icons/obj/guns/tier2/lasrifle.dmi' + slot_flags = SLOT_BACK + w_class = ITEM_SIZE_HUGE + one_hand_penalty = 3 + max_shots = 8 + fire_delay = 12 + force = 10 + origin_tech = "{'combat':4,'magnets':4,'engineering':3,'materials':3}" + projectile_type = /obj/item/projectile/beam/midlaser + material = /decl/material/solid/metal/titanium + matter = list( + /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/gold = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE + ) \ No newline at end of file From 6aa30d95b15367f3250f4b06f80b2343affd7e40 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, 31 Dec 2023 20:16:10 -0600 Subject: [PATCH 12/33] Fix 'aluminium' spelling errors + other typos --- .../modules/projectiles/ammunition/12g/magazines.dm | 4 ++-- .../modules/projectiles/ammunition/22_LR/magazines.dm | 4 ++-- .../persistence/modules/projectiles/ammunition/357/bullets.dm | 2 +- .../modules/projectiles/ammunition/357/magazines.dm | 2 +- .../modules/projectiles/ammunition/45/magazines.dm | 4 ++-- .../modules/projectiles/ammunition/5.56/magazines.dm | 4 ++-- .../modules/projectiles/guns/energy/tier2/laspistol.dm | 2 +- .../modules/projectiles/guns/energy/tier2/lasrifle.dm | 2 +- .../modules/projectiles/guns/projectile/tier1/revolver.dm | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm index 98259a0cf59..0ec9c920bf0 100644 --- a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm @@ -74,7 +74,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) ammo_type = /obj/item/ammo_casing/twelvegauge/slug/advanced @@ -87,7 +87,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/advanced \ 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 index 72995267986..471cdc3d409 100644 --- a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm @@ -73,7 +73,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_REINFORCEMENT ) ammo_type = /obj/item/ammo_casing/twentytwolr/advanced max_ammo = 20 @@ -86,7 +86,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) ammo_type = /obj/item/ammo_casing/twentytwolr/advanced \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/357/bullets.dm b/mods/persistence/modules/projectiles/ammunition/357/bullets.dm index fdeae9f637c..16ac2f51ed6 100644 --- a/mods/persistence/modules/projectiles/ammunition/357/bullets.dm +++ b/mods/persistence/modules/projectiles/ammunition/357/bullets.dm @@ -39,7 +39,7 @@ icon = 'mods/persistence/icons/obj/ammunition/357/tier2.dmi' projectile_type = /obj/item/projectile/bullet/threefiftyseven/advanced -/obj/item/projectile/bullet/threefiftyseven/simple +/obj/item/projectile/bullet/threefiftyseven/advanced damage = 60 distance_falloff = 3 penetration_modifier = 0.8 \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm index 406f98a4036..5e35edcdfe2 100644 --- a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm @@ -86,7 +86,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) ammo_type = /obj/item/ammo_casing/threefiftyseven/advanced \ 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 index eec801f3a34..c7f9e530ec7 100644 --- a/mods/persistence/modules/projectiles/ammunition/45/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm @@ -73,7 +73,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_REINFORCEMENT ) ammo_type = /obj/item/ammo_casing/fortyfive/advanced max_ammo = 12 @@ -86,7 +86,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) ammo_type = /obj/item/ammo_casing/fortyfive/advanced \ 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 index 92a46a8b1ad..7a64fbfeb5c 100644 --- a/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm @@ -73,7 +73,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_REINFORCEMENT + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_REINFORCEMENT ) ammo_type = /obj/item/ammo_casing/fivefiftysix/simple max_ammo = 30 @@ -86,7 +86,7 @@ material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE, /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE ) ammo_type = /obj/item/ammo_casing/fivefiftysix/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm b/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm index 556e918dc51..d078e015b0a 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier2/laspistol.dm @@ -15,5 +15,5 @@ /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/metal/gold = MATTER_AMOUNT_TRACE, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE ) \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm index 986c2ecb1d8..8d228880119 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm @@ -15,5 +15,5 @@ /decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/metal/gold = MATTER_AMOUNT_TRACE, - /decl/material/solid/metal/aluminum = MATTER_AMOUNT_TRACE + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE ) \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm index 32fd934dd87..385f66bc670 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_357 - ammo_type = /obj/item/ammo_casing/threefiftyeven/simple + ammo_type = /obj/item/ammo_casing/threefiftyseven/simple max_shells = 4 w_class = ITEM_SIZE_NORMAL fire_delay = 10 From c4baba0ef82b5be5aa75a14d33ffa9a4660f0813 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, 31 Dec 2023 21:21:38 -0500 Subject: [PATCH 13/33] Update nebula.dme --- nebula.dme | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nebula.dme b/nebula.dme index 92401d013f6..c06ef8898d9 100644 --- a/nebula.dme +++ b/nebula.dme @@ -3623,6 +3623,24 @@ #include "mods\_modpack.dm" #include "mods\persistence\sequential_guid.dm" #include "mods\persistence\controllers\subsystems\trade_beacons.dm" +#include "mods\persistence\modules\projectiles\ammunition\5.56\bullets.dm" +#include "mods\persistence\modules\projectiles\ammunition\5.56\magazines.dm" +#include "mods\persistence\modules\projectiles\ammunition\12g\bullets.dm" +#include "mods\persistence\modules\projectiles\ammunition\12g\magazines.dm" +#include "mods\persistence\modules\projectiles\ammunition\22_LR\bullets.dm" +#include "mods\persistence\modules\projectiles\ammunition\22_LR\magazines.dm" +#include "mods\persistence\modules\projectiles\ammunition\357\bullets.dm" +#include "mods\persistence\modules\projectiles\ammunition\357\magazines.dm" +#include "mods\persistence\modules\projectiles\ammunition\45\bullets.dm" +#include "mods\persistence\modules\projectiles\ammunition\45\magazines.dm" +#include "mods\persistence\modules\projectiles\guns\energy\tier2\laspistol.dm" +#include "mods\persistence\modules\projectiles\guns\energy\tier2\lasrifle.dm" +#include "mods\persistence\modules\projectiles\guns\projectile\tier2\boltaction.dm" +#include "mods\persistence\modules\projectiles\guns\projectile\tier2\pistol.dm" +#include "mods\persistence\modules\projectiles\guns\projectile\tier2\pistol_pocket.dm" +#include "mods\persistence\modules\projectiles\guns\projectile\tier2\revolver.dm" +#include "mods\persistence\modules\projectiles\guns\projectile\tier2\shotgun_pump.dm" +#include "mods\persistence\modules\projectiles\guns\projectile\tier2\smg.dm" #include "mods\persistence\modules\trade_beacons\exports.dm" #include "mods\persistence\modules\trade_beacons\imports.dm" #include "mods\persistence\modules\trade_beacons\trade_beacons.dm" From 172515b2fd7332125a323ec5b40d309056f77508 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, 31 Dec 2023 21:25:09 -0500 Subject: [PATCH 14/33] Revert "Update nebula.dme" This reverts commit c4baba0ef82b5be5aa75a14d33ffa9a4660f0813. --- nebula.dme | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/nebula.dme b/nebula.dme index c06ef8898d9..92401d013f6 100644 --- a/nebula.dme +++ b/nebula.dme @@ -3623,24 +3623,6 @@ #include "mods\_modpack.dm" #include "mods\persistence\sequential_guid.dm" #include "mods\persistence\controllers\subsystems\trade_beacons.dm" -#include "mods\persistence\modules\projectiles\ammunition\5.56\bullets.dm" -#include "mods\persistence\modules\projectiles\ammunition\5.56\magazines.dm" -#include "mods\persistence\modules\projectiles\ammunition\12g\bullets.dm" -#include "mods\persistence\modules\projectiles\ammunition\12g\magazines.dm" -#include "mods\persistence\modules\projectiles\ammunition\22_LR\bullets.dm" -#include "mods\persistence\modules\projectiles\ammunition\22_LR\magazines.dm" -#include "mods\persistence\modules\projectiles\ammunition\357\bullets.dm" -#include "mods\persistence\modules\projectiles\ammunition\357\magazines.dm" -#include "mods\persistence\modules\projectiles\ammunition\45\bullets.dm" -#include "mods\persistence\modules\projectiles\ammunition\45\magazines.dm" -#include "mods\persistence\modules\projectiles\guns\energy\tier2\laspistol.dm" -#include "mods\persistence\modules\projectiles\guns\energy\tier2\lasrifle.dm" -#include "mods\persistence\modules\projectiles\guns\projectile\tier2\boltaction.dm" -#include "mods\persistence\modules\projectiles\guns\projectile\tier2\pistol.dm" -#include "mods\persistence\modules\projectiles\guns\projectile\tier2\pistol_pocket.dm" -#include "mods\persistence\modules\projectiles\guns\projectile\tier2\revolver.dm" -#include "mods\persistence\modules\projectiles\guns\projectile\tier2\shotgun_pump.dm" -#include "mods\persistence\modules\projectiles\guns\projectile\tier2\smg.dm" #include "mods\persistence\modules\trade_beacons\exports.dm" #include "mods\persistence\modules\trade_beacons\imports.dm" #include "mods\persistence\modules\trade_beacons\trade_beacons.dm" From 22f9a30129288fafd064f053db26642729902571 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, 31 Dec 2023 21:26:04 -0500 Subject: [PATCH 15/33] Update the right dme file (oops lol) --- mods/persistence/_persistence.dme | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index be37fd87228..44e10a531bf 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -234,12 +234,16 @@ #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\357\bullets.dm" +#include "modules\projectiles\ammunition\357\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" #include "modules\projectiles\guns\energy\tier1\lasrifle.dm" +#include "modules\projectiles\guns\energy\tier2\laspistol.dm" +#include "modules\projectiles\guns\energy\tier2\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" @@ -252,6 +256,12 @@ #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\projectiles\guns\projectile\tier2\boltaction.dm" +#include "modules\projectiles\guns\projectile\tier2\pistol.dm" +#include "modules\projectiles\guns\projectile\tier2\pistol_pocket.dm" +#include "modules\projectiles\guns\projectile\tier2\revolver.dm" +#include "modules\projectiles\guns\projectile\tier2\shotgun_pump.dm" +#include "modules\projectiles\guns\projectile\tier2\smg.dm" #include "modules\reagents\Chemistry-Holder.dm" #include "modules\reagents\chems\chems.dm" #include "modules\reagents\chems\recipes.dm" From fb01c6b9e4ba2e450be5d7cfcf784b4c1036f350 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, 31 Dec 2023 20:46:01 -0600 Subject: [PATCH 16/33] Fix icons + give new in-hand for Marine rifle --- .../icons/obj/guns/tier1/lasrifle.dmi | Bin 1568 -> 1542 bytes .../icons/obj/guns/tier2/pistol.dmi | Bin 761 -> 975 bytes .../icons/obj/guns/tier2/pistol_pocket.dmi | Bin 833 -> 1062 bytes .../icons/obj/guns/tier2/revolver.dmi | Bin 1479 -> 1926 bytes .../icons/obj/guns/tier2/shotgun_pump.dmi | Bin 3862 -> 4220 bytes mods/persistence/icons/obj/guns/tier2/smg.dmi | Bin 1861 -> 2045 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/guns/tier1/lasrifle.dmi b/mods/persistence/icons/obj/guns/tier1/lasrifle.dmi index f0d2912ed792d9d93ad7d7ec216b4592924a3353..b25d98e146e4d506fc4d4a99ffa7e4d01e20ed56 100644 GIT binary patch delta 1292 zcmV+n1@ro#42BGlBmrQNB{4T5A|g{$Q-_C#KR-V@IyyBqHCtO-X=!O#nJHk^3_DCY zLUtWwWMuys7|IwJz`(#jKtO$*S-Fvuy?>`kL_t(|ob8&6dYdo|MgiMNh`nK&L9%xH z_Wo}<2}&*?*(O)k>11D<#zsDoNm~9T%LG9X1VIo4;lCm;_^~3t*DBXn%9Uab3#Hh) zq34xUDbYArTJxh?bB3YkMHU)Y$`w4C;Ad2Lf-dWVzpV1A4@FHS4vs9pLo@z}R9*y2?beV6vTWPJ{EJLv9fIFb1ZMprt8Ds1k;f`}p z6Z{6OiUO{EjZt<$DFq$fe4h$#OMh+g={(C&uK;i?6iS&6Wfc6Rp?{NYhUVrdsMJ#h zfnM+&*z!r7fO@*ipRVg*N-8(X(TW1?Km|7zz799|!A_1Ei!HH>5&$(5C94*4$N3zsZy*Qg;mf9~6sT2E z!GH*v?;Q!`Xc0lxZLW%mC5TY@-as%%)5NRxOmLoFP$UqRU7w@P)w^xAYnZJk2!bF8 zf*=UOmnN7#kk@B{i?(>&H-9&YvFufBX;qh05Qo6!zAc&can$N^%dCfC(kwsB7iqsd zESS@VPT^5HFSqo###|w2grlb!&e0vTTWFx=1!1tDj(fa$t z&ikL#MU`{jw{5(_ZA9zu-*+vjP(%I0!3r}jv$&}-!~LOcU4KOiX8rqMph7U;JHh6I zDTeRRLGBINS4o0QzIXCt^T8BD?4YNw=stSEK!ISsH_Qp-gGq)5=wM5Ze0ZO5Je%(g zf{}bMwn9_at#9cL4vh`8Fp}@Z^1--a)533JCb{`&69j|#UNj$!8aC~&u6Ilav*W|` zDUikTy?8!&wtp7)@NW03<+87YG$fesCFFx~IzdjK?c41=;$B44@2rCEV{6a1XJYOl^xM8u3Ps``a#c*F@dA?Fg<96ar zlakBxm696Y&YjB(f*=TjAPB;@V6j+~7f-LfO}aPba#_C2UYqS@wJMj>5X>9!8&oP+ zFR$HJRn=-iaL1{K3I0Ild5-tKRaLBdilV@O6aS3k{OiASiIa;2R9jefY#m9cbC#%u1 zKzbHPP~9RJ%J+_b!yK(7J^CN7x>Z)@Kbp<6dRl`aJ*D0f`o@Sb`QFiw%?Ha>bJ3w;vkgW8!0d1d8$En*VaHKCcpPBz zz2i8aqqPgj0R}9dUFR&Sxu{@3#GCIO3FK&D!M$xxu8oN$i1_loo?wnvdfv51cJ?~G zphzGryFEv{R_}A&ZsBS@K@bE%5ClPg5WY3R^Z}B0CY4JVA2nn1xh}o)9fDta&Ghd^ zYt9dRB?Eqj%jeqkju+hc4V5wNXw8nBprO|EaGJ0DE2!(Wwp(6sYjKhEcnntv2XT}X zy@J^9)KK?Em({cLUCNu!X>FBy^L1!>Q_5g?0SBBQP;v&AGeCU@U?~UG!&5lw zY4;aTcb9^`GmNDHC_!<|I}RwH!U@g9u^k=QD&m7m>anH|ra+K7q;&_p#!!2RpgPFRY zAP9mWd|MPSA4YKQVV{%_$l#I$nSAfmg7U#%zuDCe8`27b z|BmjX6$}&z=6fAoJ{XEa!-gANLF*m)=xT|(Ivk9#VErrDFKl25Bl%t| zAB-CwC^KS`n-7~H7|i#7qWNId@X$nq%nD}5-Tq4;i{*RqeDJInx0}uZmwhFqA;Ekv zAs>v>2y*)D%8g)NV{$$i04#S6J}gfPuP$CEU$BCoBG`t0A$ax*29wQ(?3Dc(#I{ zKJ{6{LpF07*qoM6N<$f)=-hssI20 diff --git a/mods/persistence/icons/obj/guns/tier2/pistol.dmi b/mods/persistence/icons/obj/guns/tier2/pistol.dmi index 84a159e790dd01ece6a809ec1ef5f617278ec4ec..1eb5fd990cb042987611e2aefcb11e8ba16fa54d 100644 GIT binary patch delta 789 zcmV+w1M2+w1C0001NktHiy3=9ku6chje06HQDCmazqCmkso z5?@9;Pc$ZFL^e)5FCifwM>Z@rCLBmKCo35hMMOZ5kdQ7dEUc`oDJLdDK|d`mD@xKtDg%v^Z~apbQ3N8 zb#nj!0%1u+K~#90?V5{n+aM4{!LUfEa+{=&G^ta!&Hw*nK$2a>VnIl1NRxX!lX1AP zd(mrVR~7;Q0KkBh&;Q@;V(O*7KDks%N~yJWe@Pl+)NYisQ>l~O=u}?|DSuhH+*(yt zrJM&{*L5ZJ-~63wJ=$5IOML?eT1odIk5Z(XrqMff&OcV=RNnwgWc|nEzq&(AALwjv zq=xh@4EVF_&v8e$Lq!?-divm}P5O&W+8jNBOuO~hmW%HuS`kW+(i73s$E&-?Tx|DE z4ExN|qez{!OVU3E{45H3O@HZ8Ogev;z=gJ4_>>+&n!53)PQ*;~8{~th^cbWYV{APC zX@iUPxC1h?F2UFaQ+g_Va)#}0vgP`E{L>}2#Tj?qnnTn*?rHH!-e5fd000000Iv~Z zdQjZ>tR}#$I0H;YAF1>yr)iY#7`U1~G;AfelG>cUon_(=vHBS%ynnI{j+-{CXTrws z4LAp6o7!BMw9NRZ2{13Y;NqMexJkxLJ7KmTZzrip^-X~J4tyLPwQNneAa&J#V4bxY z`6F?j#pG7zP3IltE&u=k00000ylFDuxNX%V7)8wcJxHuau*gBQRu9deR;Q=@c{TdL z@P2>3_k}%z{m0<&seiQ3c<~wU5wI_rKkdWOhSEOcNg4*~G1+MmC0}D!frgxC| zp#W=OL21veh#y7Xzze}#0{{R3007`$bA5ADH2>!>U%wS~aDDsz_O7Ub`@8!eB@Kwf z;ZXJ>5aQub*uWcuDe_;A(gohtyEjn$6qGmc|MKwj`0Mwdq8<*8$H$WS!E5CS;Fl7m TztI2900000NkvXXu0mjf>oRhk delta 574 zcmV-E0>S;y2l)k%7Y<+q0{{R3Csb#80000gktHh_z`(!_>*g2$0004WQchC2?q;3eJmcoL?tpzJ;vy1_>}B7~^>G*|+L;M0h5i z+0A$CS|c#(f|&9Iq4fq`>)}RW5XX!`Bpzzl8j+Eg^e_X|tyQ*$%uGNLZO{tA-A4k{ z6fnepag$boS2;u4R2U~sT7yoEoERrfTE|#Kn6f6_4xg!K=KB7i;hmIF>U`%Lt$REk zkLOPyjxlijtrLAhYW%7RNUi%#qY%}$4uw(&gJ0GJC{k@;0%jMrn*G${2fI~K;sq3B z@3*UQA&o)zrLb*ha?GMoFu$)(g~a%~T1el2rq&aPm~(AvTDMg=S-%7{cXVqhW?fZ{ zw5B-{YmCR^@pwEd%=>^Pn>d68&~a0uI)sKM6ge(?c4ddqbAQa1_W{=Qn>YlpybplZ z1e!z090}kcXVAJ*y9IC~9D?%<-0B{H;uhezsgXNVOAGcIJ)VkRD6nw@={ma600009 M07*qoM6N<$f=ZGDQ~&?~ diff --git a/mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi b/mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi index 5ed36d5fcb70e34acbbab4aaae40401bb78f797c..e2d30c544ec69a87a45bfa02c32c7af89f3c9d1f 100644 GIT binary patch delta 879 zcmV-#1Cac|2Brv*7Y=|30{{R3^x%>C0001HktHQs3=9ku6chje06HQDCmazqCmkso z5?@9;Pc$ZFL^e)5FCifwM>Z@rCLBmKCo35hMMOZ5kdQ7dEUc`oDJLdDK|d`mD+S_c zMgRZ+0d!JMQvg8b*k%9#0H={+kAFGNOG?ctA!tQ@9-2B-^OY4`{anDI4**oLbQ2K6 zSn>b>0=r2>K~#90?V1f!+b|4FTQ(a7gk4iUh!>L2v`2dg$nDAXBscD8L~ACPlc^ z*MKPkLV$RYVM1SyMnHs9j;lc5sd@QCIVE_Wo;YD(NC&J{E!l;VKS};k7UU;| zboeP<&p_!R5DW1qDwA$2rgZp8eb!B>J4kky9kfl`eYyUuBlL2t{?v`4wQO*4g=as7Ch1YtC@(gEBUks{n0i0^||; z71;Py0Bp1l&)mYkZhud8q8S+}dkr9-hpD80(5u^H2SrVQc%H)k!O*p(O@Qe7>;8Aa zFbu;m48t&tYcNuXzs^_u;W|!g^w)4O)*~o>Qeh5j^av8{KjdBsFw`TU%sM~G$9?vt zV?BcWBE84$KG%TM_MB=*oE{XI8Na}Q*7nJE$eafSBC-vv*LWl7Qm_Z+uwZdk04|^W zF$}{n48wRc+}+=A8voPhFJCuxaQE=-;c-&~PmfREw=_^44u@?wK~+5;Ha76i$S?A* z#FY!YNpAmp1Dh|w_6Gi4o_`#F{`$SCgX8hfmhp|Z%3t+i5R7fT3u6EP002ovPDHLk FV1j!ljE(>R delta 649 zcmV;40(SkT2*C!B7Y<+q0{{R3Csb#80000aktHPoVb3HksKda(AGH)v1$m<@yw$PSQQsg+jpcR>7M{2Oed z`4h$*jxIQ&M*y4*>LE;d;Is8n@tAe=72~HSNsU^6+9F;H0s(9C$DZ&cP}Fso+_q{$cx zM32&cY85il!DD(E*8`NWhk5T9d#d@jJnJ!lV7IOASQ~XX`m#3YYWO;5f?NcM#m7lK zz$@#GZ4BDl-xzuuAkf?D)(-n_@jU)ggY4Tz2#()Zp)l0v@lSOB>jd?q*+LcP`h(6` zM~{Mt_M-k$I~)#&=YeIs+zvM(0&o1C)XW6f9B5!hr{7;yiz(ny{|P4(dl?p zx7YuP)X+@`bVwOwJRyvL?S!D{Bs54jA#ke055n~>JDtN@`TRA2V15=poe)MGu1E+k jguh@<+aS77@^ASI!g*%NhsW)X00000NkvXXu0mjfln6Mq diff --git a/mods/persistence/icons/obj/guns/tier2/revolver.dmi b/mods/persistence/icons/obj/guns/tier2/revolver.dmi index 671af8a8f3d9f0057cd611859889019f6ba1f68d..a7adadc81eb5716705fd788219b9e2dd0de5a802 100644 GIT binary patch literal 1926 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 diff --git a/mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi b/mods/persistence/icons/obj/guns/tier2/shotgun_pump.dmi index 4314a75100529432afbedaaa8a47263ca0cf69fd..fc67eedd557c0c6280d7e4645a90aa75e94c0955 100644 GIT binary patch literal 4220 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 literal 3862 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 j=!BwmDMkJ(cEdLUS8abLbZYV=-0C=38j=KuN zFaSm8Wg7!H z+CxLhYE?1dIG-pn+AgMSkc%uD9Mu|=Qxzr3rVNfFCATEK-hcL|#q>VU%Y`*RRde?; zM5{1I^<>$_GP%jf@OGx%U8cXwS-bMBtI>}gx zPiPZa9LK*=tF#o_Elb3MVUBumt1`-xLM#XYAy8Tr);~xv&`U0JnS(j#3hVUHJq!!M zMQ{-b3M$G%y*yM8-7f8+7Pa(Hk7LTp+C8j=QgwTHdkAmL|GzVtOn$%5sfp?Q-n{pD zZ{Cdk{Sug)n*&3aU0yeU@fMN<9Dhvk}?boYIEB5O@{v84Uocbn)w0Xy#k@JhoNNNda+JAMSD52bO zlb7lmj8@{mS;?&eM~Bs><5QvPB_Mx!onKt8xV-+kaTowF6kLO4W$pJZD~r{o6#zga ztmX!6=S$s<^E$pCG1D0V)GvBf0W2$Pcj)B{6994pk$=rCMt%-J!RLOt^($}-xO>~I zr(KT3&!?IAenj?-na+rMB!8&60!Z%Ne^Tq`w=-o zl3D`#)fut#>1EYDP(=YgZf?M`zWyvbFg~dXIV(SIZWR2^KYy1V=jgCn^0|8OI=)}A ztStWeuphr~97f+r6x$2A{Zu6hntl!-J9Tg%SYVi@8$wY+u&k`B9e-abem?O@t?dtr z^3UIkyAN|Z70`4;Y%c)k#}DGjR19ge^2%8CNuccHqr)oVlbVQ6YGQC8XfMNeZ<~Sq zLDqCb$ZN3tjNFkoL!Q;?<=UB(;RSIV`5;bAaMbm%Le7 zF1W7Blb6?Jr)EIC@qfL>t@Ce`SFhiSBPWNEHt)c)vIV!#Y4c9W-9cRsg5**-N}0!YYm*JJh%Ul1c+%S=oZ0-8%VdB6ul* zyzT?u4t_pT1UWX9ZV4L_KvHgVB?qM)CtogpC#(X1{~kLxB?bV~J@6ldlMw_LlMe(L zlMe(Cf9e*XQfd)(+R-m&IwRbQQ&oWcDjn7G%Q}g6w$V&yL{dw*9wQP~tJXwlg^B`b zx*=rk9Uzxv7zwK#FF_=%LcjLh)e>@=ZV3I_bCJ{%b_EhQV*u_Izp5xePwxrzjYJFH zn_pZmD8bT+96xp_&^HoAPw$DUg{7KBPK>^he<)H{X9@f-w~X0Q8MSVOd#>Ph32gpC9N{jIrPv zwijkmtI9_!ln5ZNYjSCmR=e2 z0A@NP-mSk!B&_06;s^XZeG3PMhVb~&GBZTNDh?d@wxzb$>Ki9!zZd;qHapl%XGDI^ zzn_XL)|(gK%JJRqn|Ag;r-u`V9|aSW`2#PL4+Il`I4(fD)3e(Zt6OnYfa269H&e8M z_SY=vM&TS2Ko&B{&zE;AMOz{hK-*Ohz^(i|FL6u&%gUA%F_3xsPLe;+^NY(!U7bO@ z>H!pg?{2$^#bV;@*|UzGqjM|3bShw3Sv+{UZofAcT!S$cb9Cucln^xC5aSaU&skR1 zE@I(-c0GXYg;~ds-6&gITloC>v!lm!b`LO}3drxRm$T97JbjrcdFu3;hl&!y=8Kyc z3$D3d58(XxL1?<+TCt{Dq^?9oe}BK@$94QJ;PQnD?DXstZsq9%xmg(rt4L~zw$}sb zwtax(*};u|e|@LMdG-3OkjIj_`m0MT_CCi&iLXo0H$?( zzX_b1o8wiW1$YG@4hujW7JxV`0C89V;;;b3`5&3s0kYJDv6=t?002ovPDHLkV1n*{ Be@6fS delta 1752 zcmV;}1}FLb55*3U7k^*~1^@s6)p~kK0001)dQ@0+L}hbha%pgMX>V=-0C=2@j=KuN zFaSm8NwoO)4qbH7Zuh`Ba9do4tDGQ4NuMScmm)a& zLr2N#bhY3(pD3}$Ew*k@s;UMY&6={;4JF#;0*)gk_pE~1_J6m<%swxug>`>b`v@u~ zr*TXA#fndL_On&-<4nK1%sTn^tT80?4Q}}pLsL8`}=)P*>y9&H}8Gkn>S;A zzfHV+`4S9W_Qc%)CSH?(2N{1@0OGVPfMHs~Ff9>gW4bARukcl?zo=;`WYRin4T3#4 zlW4D5ogcqfXh{IuDTqv32k>PeBnwL`;k2xS^DqElIJpkjEqd>}ZV_wCs{nvZ zS}zUQ&c6*eF7Eiv(75Pz1#sP>*P)j$OaUkjg#VgbiToUZvd{f;^H<;|aOalY zNV`Ib@28dc-H7ZP+bMsDMkLsE1(4jm_qggkIU~0}Zj@f{{}_0zJGbnnm)^MJcO!Cw zEiE_ESL;wEP@EcIwbzvdl2Uw1lRm;JSZBr5zs>-%obhi2Om3 z|NP^)`>^L`5{7As?M2}H+bIZ5OL@1%Ys;(18#!-tSjn!>0V+FP@^*El z?7AvXUS5~OngM@}#*Z6S=ie-^-@Fq?PL9B_Z^LzqWw+0ceY@)JprHpraw#1eOaiE$ z-9v*(s66@I;>RsQrwl&u_L{~uZ)`GY9mkIyYF+?I&_K9uvFvA6Ctpv5I3T{(fWW_l3eeYo0t2ICW$!I4 zt(28u=|qknJCqn09YbILiMoZQT18HbfzdI4%v_l-8Z)$CadLYg!7{>^J~mU~~+wTg2ql#dH4rz_4OWB-gRM z_zb&M`DlkK0pxW}E^X3km5m4s+bIacw8Z(zgS+O%w|acpHxtQqY`wSvO-td_nX?an zfN(01RrdeR=U33Ql(I{2nE;iWn!EQNL(@{&>DwoQiZ68%nY0c~OL_H#fbcf2L4A`q za$a23F;uWOo6UMJzV7?_$43vJqJPg`+`ac0bM|%g@7aq-51-=w#s_?V^1JIwS`h-a zQxNYrJ|L6UaVhr$exAFD1H;33^zbQAGHD$L4t(2I+jr}mFlK)o{a-UX*merSpYz{M z#T6UPi*M)ns{1C&{^#^?;_#zj;;;b3VF8H40uYAZ~2T=LFyS+eoE5O`L!gY(d|762^Zz8!4 zYj!-;rBl;VFicBKPF+0bx<#*uh3a|$+l$XaKXxa75bhpeZYCkWw_eW1u=Dg~qU5PF zXCG)<3R^F3U?RD$ydJ>$$%8OVOIfj|xCs3&;PQnj?DXvus`B)K(yYv+b>xj) Date: Sun, 31 Dec 2023 20:57:42 -0600 Subject: [PATCH 17/33] Update in-hand sprites for Marine and the T0 rifle who's name i forget --- .../icons/obj/guns/tier0/lasrifle.dmi | Bin 1637 -> 1530 bytes .../icons/obj/guns/tier1/lasrifle.dmi | Bin 1542 -> 1475 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/guns/tier0/lasrifle.dmi b/mods/persistence/icons/obj/guns/tier0/lasrifle.dmi index 6f1420b3149c904263e0a7b21781a8d7a5820733..bfc06574530c12d11a0db2ee7f3db1c871f1edb0 100644 GIT binary patch delta 1423 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 JPDHLkV1n`U$^-xa diff --git a/mods/persistence/icons/obj/guns/tier1/lasrifle.dmi b/mods/persistence/icons/obj/guns/tier1/lasrifle.dmi index b25d98e146e4d506fc4d4a99ffa7e4d01e20ed56..dae5088532e8c15afcf5931dab0b8f8bff0c41c8 100644 GIT binary patch delta 1222 zcmV;%1UdVL48seMBmq2;B{UFQTU%*qX;V{Ez`($O#J8!DjlF+}NklzeL;y$75C0IKNu&swl;9P-ool%an+669C|OZfnJpzj>jZ?()+ z+=>MOJ}O9zg7?spui^yOb0L4)SHYZAZjqzaHQSL2FD!kW9`p^ajs@0Zb29PnIo9LPbk^a))nDNuRF6(f&w5>V%#f2s^nCB;x14w~p`y_ju0A?`tmNpQCqKl# z@A{M-r*D6Xh?4Kkeri7GFr0K`7#=G@^n3yYJ^Ikc9ar(-+@R!pbGx3SjRn*oJ-%%E z9!RZE3Pwc4d~YU_qa_3(EH0$PGDM_&Zz7tbIpM0k6Wpd36^Vpp`*XCdde6{rDFE7`CEKFU>1E4Mq&6{1Gmdh5}3as{!a0-`QRjZG^})L}@T94m@~hzMd|p*=_J9&qvYk~WEn#^rd=c)O@XXPl1Ew?QuIoP z$4P%dsNh{+!I1OCF+o915IMgH-NX*0-_t10`w#~%{T}C(miVFfN)dp@WrJS1;*j$x z_D2uvW#mW=M@3p|zZ_#V;o9i2#_JN2-;~=a*Bj0vLX0_ve*IWuIt~0%;PLBqfztc; zlBr@=$59azuPU2&6TXsb6*s*wf0#XC;D>)H-On%#!!Uj=4wcOa+yB4DdkAm5iw%YR z{l$N&ev@Ecc;UuCKyZw`-~AG@Ho72=TU4YXzWW^Patz1aJ@N(NhGBTQ)jj}6Uhg&4C(19D?9~G@#EEeZxT%8gQ*#C+}J2i zJry=m!bHB8$_LYiRDJnHh6N!*Fq-cr^TDJc`vGd(=jKrSq6$Xyy>vc!XDI&|coU<( ze=q&3E}HLU=S3D8SIQMUn&4+tc!DydAwI8!@<;TzQnzrtf;QoW@QHsLVmz@t zUn#cmz)Gzm8&$xR>1v7P`AYGHJJy@{v|_bcj~`1c&sR!WxSx2{q~!8^rKE+g=fUL# zK@bE%5Cq{%uwJkA#gB6@lOB!UY;>7#yIX0k-Yi3~=zu$*q;0wVycuKc8sUy}PZRtG ztcn7zeT`9eKq&T zv(9F^_}1Ns?!k#^P|vwlf*dWv=X)o=@xp@%G!5?PVx{pmk%NB*{H%YiDp$qqFnwc0 zn0)W($L53Db|)PecDIS3HFyGadhn$RJ5J)k;{cQI9mn|`t#2R)=;6zzsuZYIQNe%+ zneQD5Nhda?7lTVbUx=%ol0DJS>>g zhECy8Ixn~MxW-%|XoRDu8P3riv|DJP Date: Sun, 31 Dec 2023 21:03:29 -0600 Subject: [PATCH 18/33] Add sprites for T2 5.56 bullet --- .../icons/obj/ammunition/5.56/tier2.dmi | Bin 182 -> 548 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/ammunition/5.56/tier2.dmi b/mods/persistence/icons/obj/ammunition/5.56/tier2.dmi index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..a0861d03f08f3880099e04b9e0b50fa66a34e1d0 100644 GIT binary patch delta 495 zcmV0001h1Oos70Det>C;$KeDo{*R zMF0Q*IAn_=I%tBz*dLO@!otG$_xFT^gsNiza54bgpd0J#>!YNj_}F0LE3Oy-0004W zQchCREHVI&U4a5vzxTv@@@&jsu~09aW=iS72{#{d8U6G=ot zRA_3FcgN%K&;Wh=mj`~adPGWF31Vs2A;qLNt!r1>L#6k++8?^G2t%GZAqJ_ zk7(lmZ7uEhe#lFBLI40LL~~~0V#zFAc@xG3Sr{e0r=#4iU@kY*a!$hBP{g~CpsG$@ zp}pP)B1)}mk|6kv0}0*xp@{lstHkOD0(jwTbI4l0RRAi z--P408N6&2ku+g&^pNUIGlo!)hSeuKePk7?=ap3$b^5^R6Z~*&P4? delta 127 zcmZ3&vW?NPGr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^OkYWz-32_C|%d2c}0V&3k zAirP+hi5m^KuRWNIGD<$vWDA>Z(w8ic$+`hyY`+nP=d$P#W93qW^#hW9UyN31LIR^ R|8+nXgQu&X%Q~loCIBPEA9(-( From 5cf5959de490acdc51f27180738c2381889d44b6 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, 31 Dec 2023 22:28:19 -0500 Subject: [PATCH 19/33] Add belt + holstered sprites for Martin pistol --- .../icons/obj/guns/tier2/laspistol.dmi | Bin 635 -> 858 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/guns/tier2/laspistol.dmi b/mods/persistence/icons/obj/guns/tier2/laspistol.dmi index 73694e9f8f60f4f1159b152cc1c3763e4b416ad0..b96cd5733cb4c74c536e5ef4e3e2526095fc6cc1 100644 GIT binary patch delta 713 zcmV;)0yh2o1lk5AiBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`2YX_W|1W# zT?`Bi6ciKy002572Ef3;CmazqCmkso5?@9;Pc$ZFL^e)5FCifwM>Z@rCLBmKCo35h zMMOZ5kdQ7dEUc`oDJLdDK|d`mE5(_^0RR910d!JMQvg8b*k%9#0GN?nfPaTxKtDg%vr~pw^Tw^8LdZ_>a0scuuK~#90?V1g9f-nq*n{?9E&71ph zI-L9X|9^6Y0t&W35nFHfKAd-6AjwNw@sdLb0000LMASAgbJYA&64TwHJd7A(DPszt zOesZjabF%%NmeRj8g`s3zkia&O&=@3N=n5lo&d7|(x9?TnOevqzgYqqO@P^O+I(16 z*e?;6fXTuY+H$HeIHbqyv)kNM3n8-=>3A)N{~|md-bhwKb?4kE0Bh22H$SAEnY71V z3Mf(+XLY$DF37KYGI{KE0jLqsq%@BtE`7#}C@wcXXS>*E7fk_laet;;e`zZaQUq=9 z^lZI-_Vx}qJE>{PLpf*->H>ITP5V>uMRVBe0!+#?2LlC&BOqk~MEL+nDZpw-D*ylh z0002o1R?!Lr_T>-U3?vS$V8^y-vthH+%p2!ArqNahZpARo*hu=5a2{Xhw8{dxP zW(Y7YfH>*%YgZmGz<)6#sD}XK6*PVRg!zGMMi4#*;(84xOpu&2g5b{V7$Ur>LmLPH z000000Pqv{)fq?rsISgA@=thCAY%UI!wflkf($nLkINYZ^aL4d^jFIn1g!e*VqgWX zFJP!`pF_Y!>v-)w00000002BZt=CEOKfk=bB~|dWdEac43Od+rcONMQh&<2JZUQ0p vd13(o0B|GhKM!BuKS>oF4!~NfPV+CPGtpGKNql90AWWzDO}5_*8l(kbV)=( zR9J=WSG#V*AQZ)HY=%ChYz_<+TLr4}BmRO8o!dsLzrZ_Y<8N#H3Pju%PpMRn5;@>= zxc4&LlZ#NnKLV}iC+2zlO0)a6Z7CHhPw?1%y!3s4Qr&Bv72r(g2v7R+Jujm>eSdoU z>eN}Q=Ntj%mJ6-58b4VnVM;0EoJ;52v;p2#vpkQSAHC?IXVU@TU9B%Ln@%6U#xLao z5*(UUARR|UayhLAlcpOq*exZ;yudRnAsdvGSR}=95ja<)rDUuILy{557(oRktoxEd zB_J{v;Y$c}Xh6Y|sxJZNB;ZTfDSwc_MFMbkrvMSRQ&3P)@aKV>X!ScMHU*IugdDQ= z{^`w-6hxe@_m8L`O9?oa-ampVo1&YLv-N%tk&X~?q69(H!ch?cDeXY$N9!mkC@8ok znvCtx8!#}(#EuaNBrwOsj$xwT$>uxQ%Sk~$_wxcy3a%VOt^vS#;mR?#Ln6VE2XqYZ fe{_yx6x;~kHH%FK2|5mR00000NkvXXu0mjfA!^8h From abdbe141bf081d2066941bbce730f39520c18d58 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, 31 Dec 2023 22:48:30 -0500 Subject: [PATCH 20/33] Fix 357 speedloader looking like .22LR mag --- .../persistence/modules/projectiles/ammunition/357/magazines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm index 5e35edcdfe2..034f3c0a14e 100644 --- a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm @@ -44,7 +44,7 @@ /obj/item/ammo_magazine/threefiftyseven/simple name = "standard .357 speedloader" desc = ".357 speedloader of ancient design. Servicable capacity, but outpaced by more modern designs." - icon_state = "22lr1" + icon_state = "3571" origin_tech = "{'combat':2}" material = /decl/material/solid/metal/steel matter = list( From da3a7718b62b82ca6c9ab8596e5faa119d117b54 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, 31 Dec 2023 22:51:36 -0500 Subject: [PATCH 21/33] Fix 'Frontrunner' havign wrong atompath --- .../modules/projectiles/guns/energy/tier2/lasrifle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm b/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm index 8d228880119..591f3f2c5a0 100644 --- a/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm +++ b/mods/persistence/modules/projectiles/guns/energy/tier2/lasrifle.dm @@ -1,4 +1,4 @@ -/obj/item/gun/energy/laser/rifle/simple +/obj/item/gun/energy/laser/rifle/advanced name = "Laser 'Frontrunner' EG" desc = "Laser rifle used by modern high-tech military groups. Powerful compared to previous models of laser weapons, and boasts decent charge capacity. Fires Beta-type laser beams." icon = 'mods/persistence/icons/obj/guns/tier2/lasrifle.dmi' From 26f5c7d3dd7206a46f915cdfb848a789493a450a 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, 31 Dec 2023 22:57:03 -0500 Subject: [PATCH 22/33] Fix pocket pistols --- .../modules/projectiles/guns/projectile/tier1/pistol_pocket.dm | 2 +- .../modules/projectiles/guns/projectile/tier2/pistol_pocket.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 93315582de1..8c8d11c52f6 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/pistol_pocket/simple +/obj/item/gun/projectile/pistol/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' diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm index ab551bfb387..4d2fdf1a756 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/pistol_pocket.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/pistol_pocket/advanced +/obj/item/gun/projectile/pistol/pistol_pocket/advanced name = ".22LR 'Triple-Threat' HG" desc = "Pistol of modern design. Small enough to store in pockets, and possesses both semi-automatic and three-round burst fire modes. Chambered in .22LR." icon = 'mods/persistence/icons/obj/guns/tier2/pistol_pocket.dmi' From f435d07ce43b768b73fd21896cbef4ed593d3447 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, 31 Dec 2023 22:59:10 -0500 Subject: [PATCH 23/33] Add T2 .45 box sprites --- .../icons/obj/ammunition/magazines.dmi | Bin 5341 -> 5524 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index 4f8077f8ec9dc59b3151f8561ee7afa9f95e4135..74b6a4551dfcbad7ff679a0b9956fa8c2863490f 100644 GIT binary patch delta 5274 zcmYjUXH=6**Cn7dX;-}ch7A)A1 zW&mNb&1KBsVz-k2uXlB6=u0}G}&iwr~iNoS)J&j>m?U|eA@Bi zM9lR=-_6xXX{-*@A1jCbe?suRrR|=0)mmM-PYoWPawyy-nv&fx)y4Hw{r-+MQ)kfy zoWs}w!|NX&8@SnJSKK7s-}$51^q@p`6hZC!_&r5m*;pUg_iJ~XDl1(u2}EAiUKvY3 zQKtXKt52HEy;hp@2UILNX4D@nhh6=%{|{T^q}9U%lFbKo-!=<>o)<%R?K-9qcWPG* zQ~S*;>aJ7XGGoDN&zH`N0yQ|a{ z5tplNnCM7^7+B<;P2Yd?=JI{6I&G~K061Yqx0$MfwJ)%9n1D+*rsHEGBHL?DTUq=S zRdiU4o`L#G^o_$TK4v^mt$DTFX9o5Q

dWj(r3@$8YZ!x@kUfX@qe|f;; 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 E09$W_3;+NC From 6105de9ee6a6ec8e1f5181ab7f8e1ffac79ebd4b 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, 31 Dec 2023 23:09:44 -0500 Subject: [PATCH 24/33] Add sprites for T2 .357 ammo boxes --- .../icons/obj/ammunition/magazines.dmi | Bin 5524 -> 5689 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index 74b6a4551dfcbad7ff679a0b9956fa8c2863490f..3f86252a0362a7ec59731b3beda341d0c9ddf1d7 100644 GIT binary patch literal 5689 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 delta 5397 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 Date: Sun, 31 Dec 2023 23:27:28 -0500 Subject: [PATCH 25/33] Hopefully fix magazine woes across the board --- .../icons/obj/guns/tier0/pistol.dmi | Bin 940 -> 949 bytes .../icons/obj/guns/tier1/pistol.dmi | Bin 904 -> 987 bytes .../icons/obj/guns/tier1/pistol_gold.dmi | Bin 933 -> 1015 bytes .../icons/obj/guns/tier1/pistol_pocket.dmi | Bin 875 -> 938 bytes .../icons/obj/guns/tier2/pistol.dmi | Bin 975 -> 1028 bytes .../icons/obj/guns/tier2/pistol_pocket.dmi | Bin 1062 -> 1110 bytes mods/persistence/icons/obj/guns/tier2/smg.dmi | Bin 2045 -> 2288 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/persistence/icons/obj/guns/tier0/pistol.dmi b/mods/persistence/icons/obj/guns/tier0/pistol.dmi index ee83c001377944747d1af4ee35a3606c45eb8efe..4a3e5f7d75976e66f30fcf50962e9bafd4ac3230 100644 GIT binary patch delta 892 zcmV-?1B3jm2ek(!iBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`2YX_a*-t^ z7z_*y6ciKy001I7XdjZoIAn`DA_juO*pW&ne~^%nE-fsqtgI;~CP6_zEiEe)`N0JM z0004WQchCV=-0C=38k(T=Az@ zFVZ4C*jFeiSxq3#O0rt|_J#&TgkteF1M}?;OfF9KxoJgpY4{U-FzCcll$$MQqfw-z ze>v&UrTVNojht6&e7em+6>m0P%<%D`}^X(^kFx~=97UU(pO;pPtE5C8xIIY~r8RCt{2 zo9S+YFc5?>N17&WbM{EnlBUP|zhW1Ie}E7#*ua`rn(qgZkYOgaA@XD$1ONa4E>Iz% zCXo*FV?>0L=;yK%^?;VmQ3QSX)sIwMk{O6&Jrc1u1EGo<=q`!88K5Ch4X#a!Td0T( zlQ49CG`RN6`SPoq4UoP{+zfDzx%0D|WJd1H1EBR2HwRpwG3V!`&%OXMefn@Sf1ns8 z^ZEJhVlij$Mf&bf1U*USi;ND)K%0JcaMcg8p0jmE6M#1`;HSal!03z&&=mB@wS$>g zeEJ*$1W;RL_s9>LYxKSmfWAlX{J>`r2><{90072d zlA?mT{xoF`1=T;xsyO)7uhkdiB_0#j7vw$g7wZc~gZq2GqrPA~eWqVK>I+8H=jL~7 zeL=zUZUlYi=4E|>YAG|iU&`s1^#u>B)tb3{vm9!G4;rfag7tR0Vuoq3e*r#dsMQzH zD~KI~fd*P$_OJ-=8uklVkoJG>r_ z9c@JSFYMlqZ}06*g!eC`Y1%Oa;`M(r;qdJ*SFBk?HruXKU3<1|H?0JL=Dd( SS=*lg00000001h2m=5B0K2`CDF6Tfb&(|{ zkzyx*3=9ku6chje06HQDkdTlrEiA08tSKiZK|wz)Ei1slz#=+mACkg2WQ&5r*snl! zE&u=k0d!JMQvg8b*k%9#0IhmdSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1MK@K6i!&v& zs2C_>$iK5nZm&6yvXC&sOAat4#tuu!>onW_- zShT|-rNu*Br|^J2hI@4JtP5UzQG^>0000+ zM1&II+JYo3wvi-stU?kNTAq$zu2mo;^2fDNlSsrRXTdnmXF7K6RT7G*MLwjFYp)8C z&upE}ArnkGTcWlK!-%*^LgQOob-c2FAHGC6bhMy6StMqHs&cCR=Mr3h>0Oe_tD`44 z_e;zSRRf~fuN#7y^iw_nFBfMfC=@32e%<)Z?&tHFvQ?gJen-nE0euo_s4F1_IluG9 zOfNs4Hl)mTCFBBB3tsVRrVJ@_Z3!tTZ;=TxehH-Mq<#PZ00000fU)r`Q0riSo~=wt zl?;i?#rWL#R&GvC$Af1!?Szjlbs5!HEULpS@DVnT|U_+X(c>{Nq{QZ zQg@`uCp&&g)6n!8(7wJN9kKajw?NPs1zmVYV44E5`6Nv(B^!_rlIbAh$L5oCg`iw8 z1M)#S9aLW^n@=+2H3q+f$P|!&G-UJ1$zU#Y@_f=5jI$czk;H z+HkRYS*=}5a4a_K&8uq(mMqJ>o?^*1b8T=l?B0CoM8W&cmriItb|dutam#|i7=kvZ z*!wjIc($MWukRn%7989C{@1kw00000fMq=WcWi~f|1ZAa{Rjd8fNg|9<}s*ix6a?; zaJ;77I>*!Lz`g2p?beYmV|EU8?bh*r4eCC^?e&o^0030{17BPXw^?BGC;$Ke07*qo IM6N<$g7El<1poj5 diff --git a/mods/persistence/icons/obj/guns/tier1/pistol.dmi b/mods/persistence/icons/obj/guns/tier1/pistol.dmi index 22923c7f36b06717c8d6c4efb43124c16954dc8c..48df67595e9db32e087915403b0772aa8feda6b4 100644 GIT binary patch delta 834 zcmV-I1HJr+2ipgbrhln=R9JLGWpiV4X>fFDZ*Bkpc$}S)%L>9U5JlI?SA=$5@zJdt zX^}4MFO-xSO(4ybWVH0}Eq0@VR@~h?oU^!0st)C`s#S5SHaobbiC-1f8)L_&#>!x{KTfJtc%AF?j3A);RK>G8~^|UYe_^wRCt{2o9lAh zAP|KO0*n-=ae7IUI(3r1|3elKx}X>k%Hm8r=d=AoUa@;vU1oM?cDDlnfDyJlW@}7z zaEJBG_<#@RO@HP)nurzf#(W*z|9V6(z?-C$qlpOzodUD9#(tQE2m8Ee67GmF4~+Mp z3A;gg$>bsn>7WxJq*!30^!}Za&}Kr@W#7V?lxn}%KCym>LdNZkRsa)B@0C)m&+Ia} zIXeMD?U~Z8G`H2oy`}9No=V2UW4A#qMNB~2&Kmyy&wn({LbEafbZc*~%NI9kH}Sih zLIFHf&~Gq)VYuUbf~0-(J862)>{^|?1G4rHBZO`f2{7dB1QO_9ZU6uP0001hZ7l2d ziLxd@;D4uJsaV$SGnY+4{LoLq(nZxAI4NjC+ys7#mc|s=CcygmTF?CWr7MQfH-l1O+wbb~g414!2YS(metd6Y=FhC4V5@BZ$SnI}i%k(j%Z1u!T<-KzR=U z0002sf8#3i35oFa=Mypl>dq$|@9#75>&_>9{r3GwT0!OcgyX}{hsWd@mFE+VPmfQ( zawk=tPdJ@UnVX>ce8Tf7e@FA|OA%P@OBxFFgM~zr4Ox4w6=IKL7d5_~2jVFDr-=q&4n3fdBvi M07*qoM6N<$f)JUNv;Y7A delta 750 zcmVfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSJijO>MTv_uC9|j)$T#HT zOe;#vO@**gRq3V@RF_ejo0ylMnWB)CpHit?oReP?UlgB_n16?4g9*_(bI8`2l$ujQ zP+xu?nmSZJDJ!`8xqyQd0OxXNyT7&;=Kuf#BuPX;RCt{2nCW)HAP|K!1dyb*cD0MG zUEcp83rJ!T1p{)*X?s8QM`V`Egyfu=ssaE22TiYO?qVL8#l$7n(Wi5Z`r9vNRlsWf zwJ`VF!8-wNQGW>0FA}%pQlK|hn-3Y-WS2)5xxLC(2V%R=9m+!jek>7kq-w z(M7jf#;ZDYuId{Y2_Y8?<;v>z$3@73ata_$Y9Xa;TwM=Kd)nemxLlA_jnIe6v$L>8 z!c$3XcxAVz1osOFTTsmo{|r-)G)o;`HRf>nZf(#)=YMZ6A_cIag5CB)$0}%H@+%dg zpf$gt0=K<@OTdCrO{OdnHE3J&}0{X6@2loe%tbeO|R9JLGWpiV4X>fFDZ*Bkpc$|%q%?iRW5QNXkQ-t;T-9y${=o~+fp+2hN{6%n00MtWL_t(|ob8+I za@!yfg+U4-2)SvKwz<`bllJ|eu?y%jR$vhlhIVE@+du3x(jE}f%&u9+2!bFc`0_hn zBjuy9m^1TcWPb=ZNbsJd%nq6s-j-(gIIf(5K@vht62G$Ka{xnY&5IkR8MwCbeUiMk zWHSI!+-pVxH$KT4kvEon2BeS+Ac}Ajuu$P*$b7MxxdK9{u2Yha*cc+L^SlPQB7MPd1L~DI-JJ} zDc8VE0h4^50~nx=Oh8!Q{7jmkGcYGgA@QU7Zlpw)ps^6qGg!#~a3ctUAP9mW2x1${ zynQBjX@Aa-T;}aFye(m1ku{&iPcA}abzq7BkwXt(b_c&*=ItY65dh`uVXuMDdHcv% z1i<)q*l)lgJ!$HSB0xR^Td8g!!x|t6f*=TjAhvLKe_u8J_a8qWsyeuPe0qGYYT)Jh z zSBEHNz~QSy`~x|5bp!t|uWzUKkKa`toKAmg#wQ4ZAP9^i{Rv3;%l9Wl3>4^3K;swb zPe2Wn=ubc>(Vr0G;{6FRqWuYpcg2Q129f@S#H|6?9)rNt=Iu|w_80{I+SpUMfHDG;whVL=(oCxn<*z`fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSJijO>MTv_uC9|j)$T#HT zOe;#vO@**gRq3V@RF_ejo0ylMnWB)CpHit?oReP?UlgB_n16?4g9*_(lTvd^2nhI9^SYLz~ireA?m6Msq)r-oz(D2hD>1aUSc86)D%kj{YM zVgyCuRw70!T?~;fcA>8T=d!M)U>zm~ck3*z0VbHLrBscMYYEa5AY{!b0H@n)a&CS- z;;v-n@i|RUH4PUo1Ad)Vi`Ez zzmFZX6Lb#o=q0O|UKY9Bfl~Uur*Zv-qY1K^1#s&0Jw^z*26_n!!G<-U396X|aO=^} zq~SS3Ya*p5{;a+lA-r2qTbR)kSV;eH0{{R30002QG0xiuQkUkY5#zjlfK^)<7-h{z z@q>#HNq-&aBEZbh-TCU^7vsFWqbmY8e9ej=f2SX?}VQrs@z|8L&*%A^t#)o!!9yr0+2ZYz^@B7(}%{hqeazdJN`%E; zF%QWW6QXtIkgYQ*HK&B2zWh8ib@=>`OO>*MtDg%v4gj5icH!LQ;W_{S0yIfPK~#90 z?VF2I!Y~j;o3u1ZTTtlV=C~;{Q{!UPe(My`f2?Al!Fe&^dMv}%?R(R>=o_@Ob@_Y zU)pJ!Yme&LEUE0m{X0k91MoGVtTbkC(-d$TFpUGda6e#r0Nw_SR3}Zd*SmdS7w#={ zZ~d@)0RR910002sA_VFYOo!?b{D=dpN8nwfp99q+Ad1|@RVaT0jvm2~hwDW!17we2 zsMBz>2xeefk07LhX8;CfcaCiUk=yDKsK4H0f zTCKedM4C@nZq}P;$C|kF3ES<~eF);tC%kMu7P;mZqT`xhh_6r2FSLX!@-1BR3oUU9 zJlFg{%S{vm{`xfW40z8cM60oV=MzxmPv+%y_xApAQ3t!-=Oy*QU*!wR(G$|N0P>*# O0000<_QJR~Wm!FxUkd&WNsau?rUlLywpOKh{WP=IO zI&;X@nUtDSLQr3R9-2B-KPfA?`niCE6aeRPXS=_)7Uuu}0scuuK~#90?U;*lf-n?B zlYn^u+B({Y)zaF>|NmkWkO~MPU~GSCyT{Q%FS)yDaON%{008i7p!9gm=$N7(SfpWx zr+GasRtM!N-VMZ>Xf~S_2QiCJi=6YSsPU~I6%P$9E|M~9QF9Rk2aFQ87B!v?a8Bzq z`&)~i5JD;?gt^Yn>uc06pihXB2BS?oZ?l2=`8S115~+k~&O7&)y&lD59khSXSBaE~ z62u5}>)YyDKb7MQv>lu8R|(#`y{&Z?vsC{?&f=iQndGQCOM4QK}$ zi)s$e(kBs1Q&L`+s{@jyY5m_`3(x@r*7^jpdHtQxe{XW2|4{u*C>56#0000000017 z50)`|%mh9;FR%>y(THHI-Nt|2PulBXOa>uaZAN%kX=`w=Fd2ZezHGKBj~%9Gb4u16 z+`oGi8Gx$+)o5eZmZ89)0TUcF2lon-0XQ2lQnfbaTIcwnIk+F0JL~&h3jhEB00000 zLGY9jOvjcH{D=cvM&LZ7pMxzUunf728(#(nGJ-x2w+n9utQkRH(y(z{cr!39Bk*Zp z8o>?t+XDaq0001B6sz?*sQ%sk!(&hftIgA98`QvVyL%34faG}|b`uctk_R^M$M84g zPbBn!xBT}8g8u~J4O}lTulu+6kDw0r`_GX2;9B_tcux?Yw$bu(00000NkvXXu0mjf Dt<^0& diff --git a/mods/persistence/icons/obj/guns/tier2/pistol.dmi b/mods/persistence/icons/obj/guns/tier2/pistol.dmi index 1eb5fd990cb042987611e2aefcb11e8ba16fa54d..758da92369d946f13a933452e55dd24a973c2c1e 100644 GIT binary patch delta 798 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 M07*qoM6N<$f@?;rR{#J2 delta 838 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 From 44fd8498af2ffffe4bd4bbac6ead92c967060a4c 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, 31 Dec 2023 23:56:40 -0500 Subject: [PATCH 26/33] Okay maybe this'll fix mags bein' weird --- .../modules/projectiles/guns/projectile.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile.dm b/mods/persistence/modules/projectiles/guns/projectile.dm index d0960e7a36b..b62b67aeff7 100644 --- a/mods/persistence/modules/projectiles/guns/projectile.dm +++ b/mods/persistence/modules/projectiles/guns/projectile.dm @@ -4,4 +4,13 @@ . = ..() SAVED_VAR(/obj/item/gun/projectile, chambered) -SAVED_VAR(/obj/item/gun/projectile, ammo_magazine) \ No newline at end of file +SAVED_VAR(/obj/item/gun/projectile, ammo_magazine) + +/obj/item/gun/projectile/update_base_icon() + if(ammo_magazine) + if(ammo_magazine.stored_ammo.len) + icon_state = "[get_world_inventory_state()]-loaded" + else + icon_state = "[get_world_inventory_state()]-empty" + else + icon_state = get_world_inventory_state() \ No newline at end of file From ce2db26c5345641ca598380c35fb5204b27ab109 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, 1 Jan 2024 00:13:58 -0500 Subject: [PATCH 27/33] Revert "Okay maybe this'll fix mags bein' weird" This reverts commit 44fd8498af2ffffe4bd4bbac6ead92c967060a4c. --- .../modules/projectiles/guns/projectile.dm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/mods/persistence/modules/projectiles/guns/projectile.dm b/mods/persistence/modules/projectiles/guns/projectile.dm index b62b67aeff7..d0960e7a36b 100644 --- a/mods/persistence/modules/projectiles/guns/projectile.dm +++ b/mods/persistence/modules/projectiles/guns/projectile.dm @@ -4,13 +4,4 @@ . = ..() SAVED_VAR(/obj/item/gun/projectile, chambered) -SAVED_VAR(/obj/item/gun/projectile, ammo_magazine) - -/obj/item/gun/projectile/update_base_icon() - if(ammo_magazine) - if(ammo_magazine.stored_ammo.len) - icon_state = "[get_world_inventory_state()]-loaded" - else - icon_state = "[get_world_inventory_state()]-empty" - else - icon_state = get_world_inventory_state() \ No newline at end of file +SAVED_VAR(/obj/item/gun/projectile, ammo_magazine) \ No newline at end of file From fb590942749ffb72cd72c528af392173f49ade38 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, 1 Jan 2024 00:14:49 -0500 Subject: [PATCH 28/33] Okay this actually works --- .../modules/projectiles/overrides.dm | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm index 5380d7996e0..d64aa983f46 100644 --- a/mods/persistence/modules/projectiles/overrides.dm +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -47,4 +47,22 @@ research_excluded = TRUE /datum/fabricator_recipe/protolathe/ammo/ammo_emp_slug - research_excluded = TRUE \ No newline at end of file + research_excluded = TRUE + +/obj/item/gun/projectile/update_base_icon() // sets streamlined way for mag-fed guns to check they sprites + if(ammo_magazine) + if(ammo_magazine.stored_ammo.len) + icon_state = "[get_world_inventory_state()]-loaded" + else + icon_state = "[get_world_inventory_state()]-empty" + else + icon_state = get_world_inventory_state() + +/obj/item/gun/projectile/pistol/update_base_icon() // pistols have a snowflake method of checking load sprites upstream, so we're making them use the same way as all the other mag-guns via this + if(ammo_magazine) + if(ammo_magazine.stored_ammo.len) + icon_state = "[get_world_inventory_state()]-loaded" + else + icon_state = "[get_world_inventory_state()]-empty" + else + icon_state = get_world_inventory_state() \ No newline at end of file From f797666975c7560c8c7f041c81a7c8867e48d12a 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, 1 Jan 2024 04:39:44 -0500 Subject: [PATCH 29/33] It's always the designs that getcha --- .../designs/protolathe/designs_ammunition.dm | 36 +++++++++++++++++++ .../designs/protolathe/designs_weapons.dm | 24 +++++++++++++ .../guns/projectile/tier2/revolver.dm | 2 +- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm index fbc10ffab3f..c73e01be5f3 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm @@ -45,3 +45,39 @@ /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier1 path = /obj/item/ammo_magazine/box/twelvegauge/buckshot/simple + +/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier0 + path = /obj/item/ammo_magazine/threefiftyseven/handmade + +/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier0 + path = /obj/item/ammo_magazine/box/threefiftyseven/handmade + +/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier1 + path = /obj/item/ammo_magazine/threefiftyseven/simple + +/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier1 + path = /obj/item/ammo_magazine/box/threefiftyseven/simple + +/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier2 + path = /obj/item/ammo_magazine/threefiftyseven/advanced + +/datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier2 + path = /obj/item/ammo_magazine/box/threefiftyseven/advanced + +/datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier2 + path = /obj/item/ammo_magazine/box/twelvegauge/slug/advanced + +/datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier2 + path = /obj/item/ammo_magazine/box/twelvegauge/buckshot/advanced + +/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier2 + path = /obj/item/ammo_magazine/twentytwolr/advanced + +/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier2 + path = /obj/item/ammo_magazine/box/twentytwolr/advanced + +/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier2 + path = /obj/item/ammo_magazine/fortyfive/advanced + +/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier2 + path = /obj/item/ammo_magazine/box/fortyfive/advanced \ No newline at end of file diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm index 1d17d7c2c79..f37c76ab28b 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -42,3 +42,27 @@ /datum/fabricator_recipe/protolathe/weapon/tier1/laser_pistol path = /obj/item/gun/energy/laser/pistol/simple + +/datum/fabricator_recipe/protolathe/weapon/tier2/laser_rifle + path = /obj/item/gun/energy/laser/rifle/advanced + +/datum/fabricator_recipe/protolathe/weapon/tier2/laser_pistol + path = /obj/item/gun/energy/laser/pistol/advanced + +/datum/fabricator_recipe/protolathe/weapon/tier2/bolt_action + path = /obj/item/gun/projectile/bolt_action/advanced/empty + +/datum/fabricator_recipe/protolathe/weapon/tier2/pistol_pocket + path = /obj/item/gun/projectile/pistol_pocket/advanced/empty + +/datum/fabricator_recipe/protolathe/weapon/tier2/pistol + path = /obj/item/gun/projectile/pistol/advanced/empty + +/datum/fabricator_recipe/protolathe/weapon/tier2/revolver + path = /obj/item/gun/projectile/revolver/advanced/empty + +/datum/fabricator_recipe/protolathe/weapon/tier2/smg + path = /obj/item/gun/projectile/smg/advanced/empty + +/datum/fabricator_recipe/protolathe/weapon/tier2/shotgun_pump + path = /obj/item/gun/projectile/shotgun/pump/advanced/empty \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier2/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier2/revolver.dm index cda00f8c8d3..702f4eb0f69 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier2/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier2/revolver.dm @@ -18,5 +18,5 @@ /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE ) -/obj/item/gun/projectile/revolver/simple/empty +/obj/item/gun/projectile/revolver/advanced/empty starts_loaded = FALSE \ No newline at end of file From d7b35bbf5c041deca3c034d38759af2841d8cf73 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, 1 Jan 2024 04:54:50 -0500 Subject: [PATCH 30/33] Whoops --- .../modules/fabrication/designs/protolathe/designs_weapons.dm | 2 +- 1 file changed, 1 insertion(+), 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 f37c76ab28b..c15e907450e 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -62,7 +62,7 @@ path = /obj/item/gun/projectile/revolver/advanced/empty /datum/fabricator_recipe/protolathe/weapon/tier2/smg - path = /obj/item/gun/projectile/smg/advanced/empty + path = /obj/item/gun/projectile/automatic/smg/advanced/empty /datum/fabricator_recipe/protolathe/weapon/tier2/shotgun_pump path = /obj/item/gun/projectile/shotgun/pump/advanced/empty \ No newline at end of file From f65eff5972a77990771b5463fa615e9495156240 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, 1 Jan 2024 14:52:16 -0500 Subject: [PATCH 31/33] Fix T2 12g loose bullets having T1 name --- .../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 2703220f0a3..b8100506aac 100644 --- a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm +++ b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm @@ -82,7 +82,7 @@ penetration_modifier = 1.3 /obj/item/ammo_casing/twelvegauge/slug/advanced - name = "standard 12g slug shell" + name = "advanced 12g slug shell" desc = "12g slug shell of modern design. Sports good armor penetration capabilities and very high damage, but suffers from unimpressive range." icon = 'mods/persistence/icons/obj/ammunition/12g/tier2_slug.dmi' projectile_type = /obj/item/projectile/bullet/twelvegauge/advanced @@ -93,7 +93,7 @@ penetration_modifier = 0.85 /obj/item/ammo_casing/twelvegauge/buckshot/advanced - name = "standard 12g buckshot shell" + name = "advanced 12g buckshot shell" desc = "12g buckshot shell of modern design. Sports incredibly high damage, but suffers from poor armor penetration and poor range." icon = 'mods/persistence/icons/obj/ammunition/12g/tier2_buckshot.dmi' projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/advanced From 4343c8f6cf95455a43056ea83740ae5c9fef4995 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, 3 Jan 2024 21:14:48 -0500 Subject: [PATCH 32/33] Fix boxes maybe possibly perhaps??? --- .../icons/obj/ammunition/magazines.dmi | Bin 5689 -> 5414 bytes .../projectiles/ammunition/12g/magazines.dm | 18 +++++++++--------- .../projectiles/ammunition/22_LR/magazines.dm | 8 ++++---- .../projectiles/ammunition/357/magazines.dm | 8 ++++---- .../projectiles/ammunition/45/magazines.dm | 8 ++++---- .../projectiles/ammunition/5.56/magazines.dm | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi index 3f86252a0362a7ec59731b3beda341d0c9ddf1d7..2be3753a3df3db170b7277464cf30bc8673f9e59 100644 GIT binary patch literal 5414 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 diff --git a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm index 0ec9c920bf0..c35c7adc6e0 100644 --- a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm @@ -1,4 +1,4 @@ -/obj/item/ammo_magazine/box/twelvegauge +/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" @@ -8,19 +8,19 @@ ammo_type = /obj/item/ammo_casing/twelvegauge max_ammo = 16 -/obj/item/ammo_magazine/box/twelvegauge/slug +/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 +/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 +/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" @@ -31,7 +31,7 @@ ) ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade -/obj/item/ammo_magazine/box/twelvegauge/buckshot/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" @@ -42,7 +42,7 @@ ) ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/handmade -/obj/item/ammo_magazine/box/twelvegauge/slug/simple +/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" @@ -54,7 +54,7 @@ ) ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple -/obj/item/ammo_magazine/box/twelvegauge/buckshot/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" @@ -66,7 +66,7 @@ ) ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple -/obj/item/ammo_magazine/box/twelvegauge/slug/advanced +/obj/item/ammo_magazine/box_twelvegauge/slug/advanced name = "packet of advanced 12g slug shells" desc = "Container of modern design intended for holding loose 12g slug shells." icon_state = "box_12g2_slug" @@ -79,7 +79,7 @@ ) ammo_type = /obj/item/ammo_casing/twelvegauge/slug/advanced -/obj/item/ammo_magazine/box/twelvegauge/buckshot/advanced +/obj/item/ammo_magazine/box_twelvegauge/buckshot/advanced name = "packet of advanced 12g buckshot shells" desc = "Container of modern design intended for holding loose 12g buckshot shells." icon_state = "box_12g2_buckshot" diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm index 471cdc3d409..bf1d9507465 100644 --- a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm @@ -11,7 +11,7 @@ max_ammo = 0 multiple_sprites = 1 -/obj/item/ammo_magazine/box/twentytwolr +/obj/item/ammo_magazine/box_twentytwolr name = "packet of generic .22LR rounds" desc = "A packet of unsettlingly generic .22LR rounds." icon_state = "box_22lr1" @@ -30,7 +30,7 @@ ammo_type = /obj/item/ammo_casing/twentytwolr/handmade max_ammo = 5 -/obj/item/ammo_magazine/box/twentytwolr/handmade +/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" @@ -53,7 +53,7 @@ ammo_type = /obj/item/ammo_casing/twentytwolr/simple max_ammo = 12 -/obj/item/ammo_magazine/box/twentytwolr/simple +/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" @@ -78,7 +78,7 @@ ammo_type = /obj/item/ammo_casing/twentytwolr/advanced max_ammo = 20 -/obj/item/ammo_magazine/box/twentytwolr/advanced +/obj/item/ammo_magazine/box_twentytwolr/advanced name = "packet of advanced .22LR rounds" desc = "Container of modern design intended for holding loose .22LR rounds." icon_state = "box_22lr2" diff --git a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm index 034f3c0a14e..eb85ebd2434 100644 --- a/mods/persistence/modules/projectiles/ammunition/357/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/357/magazines.dm @@ -11,7 +11,7 @@ max_ammo = 0 multiple_sprites = 1 -/obj/item/ammo_magazine/box/threefiftyseven +/obj/item/ammo_magazine/box_threefiftyseven name = "packet of generic .357 rounds" desc = "A packet of unsettlingly generic .357 rounds." icon_state = "box_3571" @@ -30,7 +30,7 @@ ammo_type = /obj/item/ammo_casing/threefiftyseven/handmade max_ammo = 3 -/obj/item/ammo_magazine/box/threefiftyseven/handmade +/obj/item/ammo_magazine/box_threefiftyseven/handmade name = "packet of makeshift .357 rounds" desc = "Container of dubious origin intended for holding loose .357 rounds." icon_state = "box_3570" @@ -53,7 +53,7 @@ ammo_type = /obj/item/ammo_casing/threefiftyseven/simple max_ammo = 4 -/obj/item/ammo_magazine/box/threefiftyseven/simple +/obj/item/ammo_magazine/box_threefiftyseven/simple name = "packet of standard .357 rounds" desc = "Container of ancient design intended for holding loose .357 rounds." icon_state = "box_3571" @@ -78,7 +78,7 @@ ammo_type = /obj/item/ammo_casing/threefiftyseven/advanced max_ammo = 5 -/obj/item/ammo_magazine/box/threefiftyseven/advanced +/obj/item/ammo_magazine/box_threefiftyseven/advanced name = "packet of advanced .357 rounds" desc = "Container of modern design intended for holding loose .357 rounds." icon_state = "box_3572" diff --git a/mods/persistence/modules/projectiles/ammunition/45/magazines.dm b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm index c7f9e530ec7..9bdf95ef3f4 100644 --- a/mods/persistence/modules/projectiles/ammunition/45/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm @@ -11,7 +11,7 @@ max_ammo = 0 multiple_sprites = 1 -/obj/item/ammo_magazine/box/fortyfive +/obj/item/ammo_magazine/box_fortyfive name = "packet of generic .45 rounds" desc = "A packet of unsettlingly generic .45 rounds." icon_state = "box_451" @@ -30,7 +30,7 @@ ammo_type = /obj/item/ammo_casing/fortyfive/handmade max_ammo = 3 -/obj/item/ammo_magazine/box/fortyfive/handmade +/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" @@ -53,7 +53,7 @@ ammo_type = /obj/item/ammo_casing/fortyfive/simple max_ammo = 7 -/obj/item/ammo_magazine/box/fortyfive/simple +/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" @@ -78,7 +78,7 @@ ammo_type = /obj/item/ammo_casing/fortyfive/advanced max_ammo = 12 -/obj/item/ammo_magazine/box/fortyfive/advanced +/obj/item/ammo_magazine/box_fortyfive/advanced name = "packet of advanced .45 rounds" desc = "Container of modern design intended for holding loose .45 rounds." icon_state = "box_452" diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm index 7a64fbfeb5c..7af652ab30e 100644 --- a/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm +++ b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm @@ -11,7 +11,7 @@ max_ammo = 0 multiple_sprites = 1 -/obj/item/ammo_magazine/box/fivefiftysix +/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" @@ -30,7 +30,7 @@ ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade max_ammo = 12 -/obj/item/ammo_magazine/box/fivefiftysix/handmade +/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" @@ -53,7 +53,7 @@ ammo_type = /obj/item/ammo_casing/fivefiftysix/simple max_ammo = 20 -/obj/item/ammo_magazine/box/fivefiftysix/simple +/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" @@ -78,7 +78,7 @@ ammo_type = /obj/item/ammo_casing/fivefiftysix/simple max_ammo = 30 -/obj/item/ammo_magazine/box/fivefiftysix/advanced +/obj/item/ammo_magazine/box_fivefiftysix/advanced name = "packet of advanced 5.56x45mm rounds" desc = "Container of modern design intended for holding loose 5.56x45mm rounds." icon_state = "box_5562" From f6af4186032246c4cb8b4d8d54a66b4713b1a482 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, 3 Jan 2024 21:19:03 -0500 Subject: [PATCH 33/33] Update designs_ammunition.dm --- .../designs/protolathe/designs_ammunition.dm | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm index c73e01be5f3..5c5c55324e2 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm @@ -2,82 +2,82 @@ path = /obj/item/ammo_magazine/fivefiftysix/handmade /datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier0 - path = /obj/item/ammo_magazine/box/fivefiftysix/handmade + 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 + 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 + 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 + 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 + 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 + path = /obj/item/ammo_magazine/box_fortyfive/simple /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier0 - path = /obj/item/ammo_magazine/box/twelvegauge/slug/handmade + path = /obj/item/ammo_magazine/box_twelvegauge/slug/handmade /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier0 - path = /obj/item/ammo_magazine/box/twelvegauge/buckshot/handmade + path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/handmade /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier1 - path = /obj/item/ammo_magazine/box/twelvegauge/slug/simple + path = /obj/item/ammo_magazine/box_twelvegauge/slug/simple /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier1 - path = /obj/item/ammo_magazine/box/twelvegauge/buckshot/simple + path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/simple /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier0 path = /obj/item/ammo_magazine/threefiftyseven/handmade /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier0 - path = /obj/item/ammo_magazine/box/threefiftyseven/handmade + path = /obj/item/ammo_magazine/box_threefiftyseven/handmade /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier1 path = /obj/item/ammo_magazine/threefiftyseven/simple /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier1 - path = /obj/item/ammo_magazine/box/threefiftyseven/simple + path = /obj/item/ammo_magazine/box_threefiftyseven/simple /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/magazine/tier2 path = /obj/item/ammo_magazine/threefiftyseven/advanced /datum/fabricator_recipe/protolathe/ammunition/threefiftyseven/box/tier2 - path = /obj/item/ammo_magazine/box/threefiftyseven/advanced + path = /obj/item/ammo_magazine/box_threefiftyseven/advanced /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/slug/tier2 - path = /obj/item/ammo_magazine/box/twelvegauge/slug/advanced + path = /obj/item/ammo_magazine/box_twelvegauge/slug/advanced /datum/fabricator_recipe/protolathe/ammunition/twelvegauge/box/buckshot/tier2 - path = /obj/item/ammo_magazine/box/twelvegauge/buckshot/advanced + path = /obj/item/ammo_magazine/box_twelvegauge/buckshot/advanced /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier2 path = /obj/item/ammo_magazine/twentytwolr/advanced /datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier2 - path = /obj/item/ammo_magazine/box/twentytwolr/advanced + path = /obj/item/ammo_magazine/box_twentytwolr/advanced /datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier2 path = /obj/item/ammo_magazine/fortyfive/advanced /datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier2 - path = /obj/item/ammo_magazine/box/fortyfive/advanced \ No newline at end of file + path = /obj/item/ammo_magazine/box_fortyfive/advanced \ No newline at end of file