From 7a4d9abe2dce37483cf8bacf4b02d972f6c26c05 Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Thu, 12 Mar 2026 05:07:09 -0500 Subject: [PATCH] adding the Assult rifle --- .../Spawners/Random/dungeon_items_weapons.yml | 3 + .../Fills/Items/weapon_cases_expedition.yml | 14 +++++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 57 ++++++++++++++++++ .../Weapons/Guns/Rifles/ma5b.rsi/base.png | Bin 0 -> 631 bytes .../Guns/Rifles/ma5b.rsi/bolt-open.png | Bin 0 -> 643 bytes .../Rifles/ma5b.rsi/equipped-BACKPACK.png | Bin 0 -> 843 bytes .../Rifles/ma5b.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 843 bytes .../Weapons/Guns/Rifles/ma5b.rsi/icon.png | Bin 0 -> 640 bytes .../Guns/Rifles/ma5b.rsi/inhand-left.png | Bin 0 -> 520 bytes .../Guns/Rifles/ma5b.rsi/inhand-right.png | Bin 0 -> 544 bytes .../Weapons/Guns/Rifles/ma5b.rsi/mag-0.png | Bin 0 -> 124 bytes .../Weapons/Guns/Rifles/ma5b.rsi/meta.json | 47 +++++++++++++++ .../Rifles/ma5b.rsi/wielded-inhand-left.png | Bin 0 -> 702 bytes .../Rifles/ma5b.rsi/wielded-inhand-right.png | Bin 0 -> 733 bytes 14 files changed, 121 insertions(+) create mode 100644 Resources/Prototypes/__Triad/Catalog/Fills/Items/weapon_cases_expedition.yml create mode 100644 Resources/Prototypes/__Triad/Entities/Objects/Weapons/Guns/Rifles/rifles.yml create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/base.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/bolt-open.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/icon.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/inhand-left.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/inhand-right.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/mag-0.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/meta.json create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index b33fec89a68..0878f7877b7 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -291,6 +291,9 @@ - WeaponCaseLongRailgunPeregrine # HL. Intended rarity for the Peregrine #Hardlight start - WeaponCaseLongVortex + + # Triad start + - WeaponCaseLongMisriah # this might need to become tier 5 chance: 1.0 offset: 0.0 rarePrototypes: diff --git a/Resources/Prototypes/__Triad/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/__Triad/Catalog/Fills/Items/weapon_cases_expedition.yml new file mode 100644 index 00000000000..f88d35bfe93 --- /dev/null +++ b/Resources/Prototypes/__Triad/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -0,0 +1,14 @@ +- type: entity + parent: WeaponCaseLong + id: WeaponCaseLongMisriah + suffix: Dungeon, Misriah +# categories: [ HideSpawnMenu ] + components: + - type: StorageFill + contents: + - id: WeaponRifleMMisriahAutorifle + amount: 1 + - id: Magazine762x51mmFMJ + amount: 3 + - id: AmmoBox762x51mmFMJ + amount: 2 diff --git a/Resources/Prototypes/__Triad/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/__Triad/Entities/Objects/Weapons/Guns/Rifles/rifles.yml new file mode 100644 index 00000000000..154e19124d6 --- /dev/null +++ b/Resources/Prototypes/__Triad/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -0,0 +1,57 @@ +- type: entity + name: Misriah Autorifle (762x51mm) + parent: [BaseWeaponRifle, BaseGunMeleeBlunt, BaseC3SyndicateContraband] # Frontier: BaseSecurityContrabandPx%F-b&0R9J=WltD`zF&KuQ(Jajtb1T~tmMLrn4}(&uf1!WCi-(~X_f&7v-ywUm zCx3uPdo9+BAi_{o*u#QsVUR&=?Iq$2Y})itGu?H!qO{N+=DB=dGD+SyUy^}}ii(Pg ze@t+n!CPBf?lj9d%QBv54ZxeVwR^2`6LFhZk|ZoHE+VC5Z*LDNB~7h4%QBi;Bc=Qk z?a2nVx3^tU6r5%mKp6o}`u#GOQc@HJ>z$6fOBLcccHiYC01tV@=H_NFV!)Tzi_W%M zoL#qlKHF-QCQkZ&W?LyQO%$-KHptvTclEZf?#AAqbw& z&pUuuD=Rd$<}}Orm?U(Mk4JV8Ei3>`>>msU)M~Yn$_yKlQgX$Ya?VsS!{Ol}*4kf} z&{yDKfB)7}dZC*~;RU;^ThObvw-G`l>TX*kyy!4f;_fN_5oO->EF@|2R7XU<2Px%JxN4CR9J=Wlrc*jK^TUg)j2X3oGx6#aBScrSS(5){sD{pfixCN8m(d{`5khd zsVprlO&gMH1QC{?!W9Q{fkhTEG0lj(aFa}mIGZ~?C6Yi=?9+VT%+AdF&Nnj)6%`c~ z75|vvE`ztWw%l=+agt>`(i(u*tE+cf<0|4du_Q^DpPxrc$3f9_fcUu(}78YEm(+T1@cHiYW0QY&o#>Pf4 zV!)Tzi%z#%oLshjKHX}SCXV`jrdutVS`){ylTu=gp;oK0xw%;y=yWXU~dw4jqlW1-ZU~K~FG!rrLRJ6(002ovPDHLkV1hTXBlZ9Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/equipped-BACKPACK.png b/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..211e9b592836d5ab2a863bb34b43eba20ab2b7f7 GIT binary patch literal 843 zcmV-R1GM~!P)Px&1xZ9fRCt{2n!jt?KorNnZapXgLzfy)c2Er}gg{enN;CyLWD;lyM3BY#NBYkw zpdkTG84T%?W{IF=(2zwWrUWCp1#&74z7CCDId$|qk`3>(+34QA_q`{b?C${tK@bE% z5CoA6!!U$l7^2D?K5cBIp1)qyaJl8OkG z7~8g|tKF65%yDuHFeyF=0-T(jq+Wq6*tRW#Ab=!EFijHx;CWuASa0$q(rUHD#l=M> z#RJG)Jn{&j>$=$4*#UskiU$Bq(`u3=;rRF%05JOS6#(G-ex`VDvkVHi{pIClX~j<% zkH=r|wDP~bckq25!{IPf9;pXaanFa@+uIWewY}pwxpGJ~xa#5+MG^IS9V;si%R#?C;~YhiSb!|XV-;AICAzW<(=@>t zi_JNa0Jd$5gMPn|1YaA+ai)$DfLIY?1z?N`(=^eQWmuNA&|P5LwqT6Sd>7{!MVg~w z^-R-5r_;%u$(5{RaFu0 zfQLaR)<1|8pxJC{j8)yh%f(0FL9-9tQu~o-qbhRp(wivC7M& z)oRUHb(*Ht!ly)%xJRk2v3Z28^0Jt8+u7OKT&s?A4z|0Ne;W*|_*`K;Yr)ZIRElFW znR9DvYwny^S66>?KfS5Ni4eaH?yd>Wd1NAG8m4LHR1`({?l>}DqyTJpO-y{aiK=0$ zaEp`9`S|z<&N;Swo00J%-vfMi{GT%$=IH3C5|c8C;7N){oISpOsEKcb@6!Vb*Vore z;mWSBuL}UUzrT+?Ium$-^-D)z#5yDb`xM(V%>K@bE%5CpN<`~h|< VZt4JWW}^TA002ovPDHLkV1g_Ye#HO) literal 0 HcmV?d00001 diff --git a/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..211e9b592836d5ab2a863bb34b43eba20ab2b7f7 GIT binary patch literal 843 zcmV-R1GM~!P)Px&1xZ9fRCt{2n!jt?KorNnZapXgLzfy)c2Er}gg{enN;CyLWD;lyM3BY#NBYkw zpdkTG84T%?W{IF=(2zwWrUWCp1#&74z7CCDId$|qk`3>(+34QA_q`{b?C${tK@bE% z5CoA6!!U$l7^2D?K5cBIp1)qyaJl8OkG z7~8g|tKF65%yDuHFeyF=0-T(jq+Wq6*tRW#Ab=!EFijHx;CWuASa0$q(rUHD#l=M> z#RJG)Jn{&j>$=$4*#UskiU$Bq(`u3=;rRF%05JOS6#(G-ex`VDvkVHi{pIClX~j<% zkH=r|wDP~bckq25!{IPf9;pXaanFa@+uIWewY}pwxpGJ~xa#5+MG^IS9V;si%R#?C;~YhiSb!|XV-;AICAzW<(=@>t zi_JNa0Jd$5gMPn|1YaA+ai)$DfLIY?1z?N`(=^eQWmuNA&|P5LwqT6Sd>7{!MVg~w z^-R-5r_;%u$(5{RaFu0 zfQLaR)<1|8pxJC{j8)yh%f(0FL9-9tQu~o-qbhRp(wivC7M& z)oRUHb(*Ht!ly)%xJRk2v3Z28^0Jt8+u7OKT&s?A4z|0Ne;W*|_*`K;Yr)ZIRElFW znR9DvYwny^S66>?KfS5Ni4eaH?yd>Wd1NAG8m4LHR1`({?l>}DqyTJpO-y{aiK=0$ zaEp`9`S|z<&N;Swo00J%-vfMi{GT%$=IH3C5|c8C;7N){oISpOsEKcb@6!Vb*Vore z;mWSBuL}UUzrT+?Ium$-^-D)z#5yDb`xM(V%>K@bE%5CpN<`~h|< VZt4JWW}^TA002ovPDHLkV1g_Ye#HO) literal 0 HcmV?d00001 diff --git a/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/icon.png b/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7a0a08f3840178d51ed9d1fccff3874e27087fd2 GIT binary patch literal 640 zcmV-`0)PF9P)Px%I!Q!9R9J=Wls`)xK^Vq=t8-*7I9<4e;Yi>jSS(5;cGiA@G!{!5tzswn9CDqh zt`3%$R*a1z!V>?$6$f&GLl!YH&4{~jlT3;@n>)RT<_~H1*Szn{&dl@7J2MLf1qB5K z|C!(}gV)y9+;Ng{k|aFR8i3c!%XeDiD&i)wIF6Z_nL$d)*47qMN~&6Ok|b2MMoRf7 z+QSVrn@yKx8OKQikVk-{PAAW$lw?`PO1O&6w62 zt@U+*OHrj%-j}8+)>`O)hOd^E-207<8+Y${_~Hu}>rY72lybR@F@|=#9RP%3=&ZGQ z8_3UlST#ocpf{_lfuE$5LI{z^{#+@=*}Dn=<#L%cO$W?bYZ-fN87A((_s_ZZ4BPE? z5Qd>M#^k%JR4SaFo}!c@j^m+EE{Y-t@G;%ReEK2gtKr3k5Ex^aottKReGjG7-Ts8P z;rZNC7l^MoJIZ-i3P*70t aTYLxAPALrUE9bcY0000dFoTyR|J9{z zpF+>j*Rw9n%P-on$Rqq8=L-fGD6l=7wt2zD^;^v{zSK_Mb@=kjDZ9KQvYWry&h(ii zrdY|iYL(Q|H|L|Ik3BB@{PW{W#nkV=!d8cFPD+i8i`iQ?`&;?itq*^uPW&V0u`4Pz zMd)pDySzLh%KR0e^<+RqyX)FH}t0=+2FZQI*%*{DH8IwM=?CARAkfWw>?D`)EYqQU@|1_NX z7VM*@;1*tY!18*wu<1|T3C}Ah*xE^^#9rUKzNM^gf$h(Ilf)Iwgaw?H?H7C!_~WUj z(3V!`@K(1#6DVeEzaXr^duD?~y_UVeZ1#k@h7OO5>^3F5iMQNVY6GK|!PC{xWt~$( F69D7NPx$+DSw~RCt{2+A(XwKo|z#S8+K1L<+Xxa1>g&t#jvWf;jrSI)a0e`~{ zp-8z^kZjkb7m{L|Gf`{o`%D>3xcAGKD1HYJ5fKp)5fKsnKuYQUdJQ3@lx{p82d}js z`oZmX+jvpu5=D{o>kKVIZ~?L`>$OTI)`<`cJ0wxbg^0CX?cL zU$)9!)mpne&mn|Bk|bCzmluE6>-Yl9W;6I~aU2)9ibueQ2Y@6=002so5E1ghz2M8gMrYQixpV(#V^}2^rmNZQvgs6O`4*-kB!l6{9kK4D(1-i^<@R@u@ zpSceJ@0(3=f-wfW)eWq*f3xBfu-0O?x~X)v&)f%qyU_?JwTiX26JL9wvMlTQ8|pLq z%y_uJ@AQkVjsKjTh=_=Yh=_=Yh^Sr^Ma93UjV7-bD0n=MV~wA?ZaR;P&{9fQH-5f! z2Xz1dyuRpSVl*5Mfv*v?pDrJ>2<2;)3w=xn7vQ_P@pDt=(0000Px%cu7P-RCt{2+P`btKoke?uR#X6psB5gP!uqQn+yqPi|LlN-W-bPl1|MQiieJY ztR;VevlLV0?Yw$bho+*5aa=G24W?x9>JSNJ@;W3E{u#@S?U?j^mb2y4z0^z8oFVtF<-!xxB=u{r#EmUo}dcPEty`a9xBCuBs{kz_Kjb+1VMJ zghHV}$z&2Y>J^^h1xlsTN+xS+0;H7W`#u0f58nUXG)+=f6~6CdxV=%Y007-?7eWYX zwOUI_f|Qc-`Fvvd^EhJ@u#wFY02~}1!uNett5pO+fM1RS0QeCENG6l`eSVH02ml~z zox47(!uNd?i$yXF1LJn<)D;mzP%f84x7&rLX;Ew2HWWocDwPWRAqWE0>-C9aEo%q# zD-;R@0H$f;!gcZW_!wu6Ml_FmC-iY|kA9w2#1zr-9q;e((K42=Y7+TicuXUOPp*-ClYE48w>LFmApJ zosh2Uw6(nn0QgptkMi*0f=yd2#u#IaF~%5Uj4{R-V~nvU@1LqAQcALI8@XH#07mL< zi!|@pu?|RtEXyLtaia49;aPxXSXAs-+1tow>HY35US~2Wm&+6T4VT6hMM1OKe9#KT ziCw8w24V;yC~oXnJK(I*NE~D`)IR~&bqD%*o(Dy_9j@2w!Sg(5nigmH2ge>Zuh=8{ zOU-XSza+yjsQ+3>*L8aLAy2xlkNmdC*g^=JHTF#Z0sSTB>)QInl5(^b07*qoM6N<$f`8LQ_W%F@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/wielded-inhand-right.png b/Resources/Textures/__Triad/Objects/Weapons/Guns/Rifles/ma5b.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d62e47b51dfb325e6a3ad0a007c3a681cdfdda4a GIT binary patch literal 733 zcmV<30wVp1P)Px%mq|oHRCt{2*}qF0VI0Ttx2=IYF=I1GxgiuXh}gnYmxgYxW>X||@%{oS4h6Ae zr{ZQem*Nn&%j#C_P&l;W6ez-pWU%dYrFq~9eY*5g6LX2iq?PvjTJG+-yXVK}ek@-Q zLI@#*5JCv?{}~%rN3SoDwS?^7^wji3I!X-F?X}@!}&&rNqpb8T5BA~p>qqMwFYQA4uZfA z5<=&FgZ9%;&o|)c=%{PEQVL@X0LB=q)hb$RJ{UtLli?r?F~)F^$*{1nKoA7><@!1R zACHfFE}~MY*f0!RVUAkQ0MeLW3$4{^05lp6n$0G~Vv#tG$!4<{V{jaYjg1XzwOZdN z_i$#$K3iGAaU7y3B8sB6^P~EdQadda3bxT`;JPkA*F`9$TGvd>M|`d3a9x+AE!jSv zo8!&aR^J5#L11@wc3Q`2|D0h;9l-NE`(*wR@AnRIUAOO3R7zQZ^Ye3Zxg22_4mA0s zA7J1Le zzfZAPy!GYqP6HK3J0+D|tu literal 0 HcmV?d00001