From 9aa5c045e23043ee6ead1a0ad57b7f3760208cdb Mon Sep 17 00:00:00 2001 From: Niko_de16 Date: Tue, 17 Mar 2026 09:46:49 -0500 Subject: [PATCH 1/7] The Forktail is Admeme again! --- .../Ammunition/Cartridges/antimaterial.yml | 22 ++ .../Ammunition/Projectiles/antimaterial.yml | 23 ++ .../Objects/Weapons/Guns/Snipers/snipers.yml | 238 +++++++++--------- .../Guns/Snipers/forktail.rsi/base.png | Bin 0 -> 734 bytes .../Guns/Snipers/forktail.rsi/bolt-open.png | Bin 0 -> 729 bytes .../forktail.rsi/equipped-BACKPACK.png | Bin 0 -> 1278 bytes .../forktail.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1278 bytes .../Guns/Snipers/forktail.rsi/inhand-left.png | Bin 0 -> 924 bytes .../Snipers/forktail.rsi/inhand-right.png | Bin 0 -> 937 bytes .../Guns/Snipers/forktail.rsi/meta.json | 41 +++ .../forktail.rsi/wielded-inhand-left.png | Bin 0 -> 1033 bytes .../forktail.rsi/wielded-inhand-right.png | Bin 0 -> 1015 bytes .../Projectiles/25x59mm.rsi/base-spent.png | Bin 0 -> 517 bytes .../Projectiles/25x59mm.rsi/base.png | Bin 0 -> 574 bytes .../Projectiles/25x59mm.rsi/meta.json | 17 ++ 15 files changed, 229 insertions(+), 112 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base-spent.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base.png create mode 100644 Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/meta.json diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml index 187517eb6cb..96dc417ca88 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml @@ -14,3 +14,25 @@ - Structural - type: StaminaDamageOnCollide damage: 100 + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseBulletTrigger + id: shell(25x59mm) + name: shell (25x59mm) + components: + - type: Projectile + damage: + types: + Piercing: 10 + Blunt: 30 + Structural: 1000 + - type: StaminaDamageOnCollide + damage: 100 + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + totalIntensity: 10 # Bit less than 1 Tile. + intensitySlope: 2 + maxIntensity: 2 + maxTileBreak: 0 diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml index 75f79c2e822..54e9f10ddf0 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml @@ -20,3 +20,26 @@ - type: SpentAmmoVisuals - type: StaticPrice price: 20 + +- type: entity + # categories: [ HideSpawnMenu ] # Frontier + parent: [ BaseCartridge, BaseC2Contraband ] # Frontier: BaseMajorContraband!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo}pnEhuArwq8+Ibo@t(*S_~XO4l9EcBP##6t!GuJ+}&8i{TG>mqy| z)X%MK5X)!~n^CA)l(TdZgHvo$WlEy7WTe4&rT#th_WxQP%l(5%Wp4dH$$eVZ8EY9Cj?L)LY+mxa>*){vM@MfNtl2rG zXw%y+6@l*e-+x;y;Zcdr*&UR%jb*jtrC2@j@X)JDA49zyF3t5*k6C}c&R6s4nyvc3 zZLJ#vVl-QKt&8t!Q(^CWcy#tM#)d`<&+RG`kN%i-KX3c=y>`c=RXar;bm~Y?AiVm-bja zD8FZN_Hxd5KA!y*^Ov(EeH6&f{kC#`>X~n*<<@TR8FpufWK?Gsws1-$n?=2@TQ|AH tsl#9!hyT_ueoy*t=-i0ad;C@C596(KN)yX&{JI5-Ax~F7mvv4FO#s!w@?ih~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..79ed1ce3d26b9087b1717f48738c5b2c140dd625 GIT binary patch literal 729 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo}pnEhuArwq8+Ibo@t(*S_~XO4l9EcBP##KQ^#uKP=ECsZ7}Z)xaz zW3EQIsNda&?f^{bM@e>c+)W)G|Xch1CLZC_$N|NLf^ zeQciBx2y;-=$7w4Zn1<3vLp&xVO*N1Z`cHPpkZj1mb zPLz1GA!UHfxKzcQG%l$oL*s`|lECd^y8~sKZg*iY|W@o15l)>vi+}nESo< zzsc>r%%An`o@+Kn*c^$9u6Y%|DdqRH-LXkU4UbK=w(Q+zafqeI(0c7xlk1*ViY^k- ot;?gT)Vzopr0Jfy?xBvhE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..1eb55ed264cb5013bfad96b4f1b381b409a4ca24 GIT binary patch literal 1278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybenz+i-#WAEJ?(MAj>{|g6$K=)TiJY0aS757c z**4Rr0FEW~jxUy8fBWv6BirAy+j(qvPgR*l9FK~*p%%9#B38qrtn4x8yDKWkpGcgY zbwBjiv1hi=E#G&lo#$S%L}OuK{wBA*Cy(sNdUVRz_-T;pHpi7`zWVUEI6ghFCt$Ag zOosit?2V)T?UV@XdnI#Sa#B-WdCvDfENF;Z-(Ixxkl8AePusdx8Zu|;%s#uT{`~Ggj1Rs%)&5>FH!N{h znu?$kw}RTfUAt!ee&T9oZr)fZ+VwnzQ?+5nhfkl3ww(;WcIw^7-P`l;B*$KN?ljoU zU^DTtMS%>vxVX3^gT<};$*WtNCe^+?e)DE_!k^2#Ki~c3{^Ml6a%7rNgZhSC>20~k zcYRW75nwwI+pyt`3Il`1V!=5VUtFA5U;j_BxVrp%Mrg?875R%Jbet}mgtusL8*XOk zc$xS9=-a#bbL#)FoZe(~>|CFA(+-9Ix>JI__X;e%_}+Y>R)VBLi^1uxeRqY_9X8)| z+5Vk**0Rp!P7^H{Lndc1{@^v>n)p57PJq|Vzkh8R7TkZYp7%!+0yvX0|NdZ@(i=UM zb0$a`s?&!*YiO3|f1C?3gIIdp*M{ zn;))1ChZ5rxmNxCQF(xOc8=cjeR9)fx977m95}eHGiqwr!=;YbOOO2)o^$a;@9A%X z6x9q|k4UJs(6Gs^2^M+`3fQnIOUT_??N$9>@JVE4U0^?)9(wG+AenrxVb! zyO}?B9FD7HF+N;dZ`ikyVb{9N8_sejKKR*Gv`&ocO-B9s@5UciGk8ex|E#f_Hud=j z>%BSW7FbqrIdCM-TDCAkXHnpNF@NUApFV3HtW+}onOVznNxf-|DGvb&fFuf{kEOa&)@IH!-o&Abn7U8JA9y4W#79Jo7^oc znHU;UBWGr=QuSnUd8@o&ijfmX_V(MIvrHJa+|G65NOX)%i2GQ}@;Q39Frj$R;OP|qlGK5=_{(lSsn!rJkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybenz+i-#WAEJ?(MAj>{|g6$K=)TiJY0aS757c z**4Rr0FEW~jxUy8fBWv6BirAy+j(qvPgR*l9FK~*p%%9#B38qrtn4x8yDKWkpGcgY zbwBjiv1hi=E#G&lo#$S%L}OuK{wBA*Cy(sNdUVRz_-T;pHpi7`zWVUEI6ghFCt$Ag zOosit?2V)T?UV@XdnI#Sa#B-WdCvDfENF;Z-(Ixxkl8AePusdx8Zu|;%s#uT{`~Ggj1Rs%)&5>FH!N{h znu?$kw}RTfUAt!ee&T9oZr)fZ+VwnzQ?+5nhfkl3ww(;WcIw^7-P`l;B*$KN?ljoU zU^DTtMS%>vxVX3^gT<};$*WtNCe^+?e)DE_!k^2#Ki~c3{^Ml6a%7rNgZhSC>20~k zcYRW75nwwI+pyt`3Il`1V!=5VUtFA5U;j_BxVrp%Mrg?875R%Jbet}mgtusL8*XOk zc$xS9=-a#bbL#)FoZe(~>|CFA(+-9Ix>JI__X;e%_}+Y>R)VBLi^1uxeRqY_9X8)| z+5Vk**0Rp!P7^H{Lndc1{@^v>n)p57PJq|Vzkh8R7TkZYp7%!+0yvX0|NdZ@(i=UM zb0$a`s?&!*YiO3|f1C?3gIIdp*M{ zn;))1ChZ5rxmNxCQF(xOc8=cjeR9)fx977m95}eHGiqwr!=;YbOOO2)o^$a;@9A%X z6x9q|k4UJs(6Gs^2^M+`3fQnIOUT_??N$9>@JVE4U0^?)9(wG+AenrxVb! zyO}?B9FD7HF+N;dZ`ikyVb{9N8_sejKKR*Gv`&ocO-B9s@5UciGk8ex|E#f_Hud=j z>%BSW7FbqrIdCM-TDCAkXHnpNF@NUApFV3HtW+}onOVznNxf-|DGvb&fFuf{kEOa&)@IH!-o&Abn7U8JA9y4W#79Jo7^oc znHU;UBWGr=QuSnUd8@o&ijfmX_V(MIvrHJa+|G65NOX)%i2GQ}@;Q39Frj$R;OP|qlGK5=_{(lSsn!rJkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybes`K!4aSW-5dwc7C)*}ZIwh!m`>P`urwo^Yu zh{wE=%%@@iZ)2AIe9*m3&j-Nm1-=l2B` zGjS-k2snWVaZTT(%`?vT*q(dXZClV;_M7>GK1X$A_!~x+#~puF7!~xleY=plDAH^4 zje>I$&-e9h3}?9cmOsEt(KqRFl;}Z=B;NPNYZ#Y!=1d9tR*>HP^Gv{uZ=2RdFe?C= zEeB;kC3SCW)L6PF*1vBf`+}{guiC&?QJt(u5G&Edi=U;%xk}%l$hQ>`H7o6 z`&!d?%>wpu@gF|x=G)v;;W~Rbx#znQd+z@)e=hBajeaBQFePY*Y~Pzi_3eiPU-w_w zxkr_o;quEXHPUsqySd)n{J-~q^VziE-FEExq6`Z@pDe%oZxPGm6Dg5tYJm}zsqOBzs=zA)^)W=dp*dOek?!GE*|JjW$CjB{?Ylo+wM$>ykp0B8VOQA>?fGwu^BGOH9*+H)HNTp>p=56D fp{??Yet%gfH-5BRFl|K_D1CXl`njxgN@xNASTJkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59MybestfgWaSW-5dwc6()@lb4wg<`ETZ?#~zTuuI zs2HHZHOW0=q5lJCwn^?BdsRgAM4B!oeLK8#=j?UQ^Q;v8uAF;uB&%v)sD$g>`@+dK zOae|EiY*|b`TLIo{YM%iuPUZ;mnNKea^!xw{HsM?w-^odFZg}6UV1Z3HcPMXP_5<6 zDObylY|mZdN{CYcs_)1M@v9YaU$|oRy-N(I6c!ckik+b$`4$ zmeE{$Xpe)!BCD7HsRJkW-l?B=R{UJfz5z}0$<{X~!^TYE>Uj5l$GUS$uD#Y$o{;{g%7nk6}Q?e@$ zyK{A}NdN!-oxINU(~GaPC0Whw%KjdnD|#jDzyx*vWykF~YbL6AzRiC&!BAhob5e)r z1Mz3!(Tw&7S!M3nt*f(NefoUYocj-X@9txIa#XSU?u+_-HkWg&KPlb#emf?*?vxED zB$!$v3fI*uZ{sYan+s$~+a?g7^zh5>JD;p(t zPQP}$FUkHG9(- z59=IcT7PFBnDKMLwz)YoS@ua7%Ue8O`fz)qNP~*L%P!rF**Wjm2Qpj&hTkU}c9)jz zI<2>NU#JpYq5IqB{MFE?Oi_jz+ZO1)sH%5c6?MV4^x~%cSVre`+lEbICBm^=->hW| txZ0Grs(aers|-uFrN?jDD(kfBFS~=pN4q@-fO!B2JYD@<);T3K0RT$wS04ZX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json new file mode 100644 index 00000000000..c979da8c911 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by nikode16 (Githb) for Hardlight, Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/forktail.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1962b4afa2615fc966e00ea21ebb23076df65f48 GIT binary patch literal 1033 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybes@v-6;uum9_jcCCNskP8+Wv2`-om+brSsc` zKJ%~qP&C?N!)nXVX!=r9^3??<)rX3Ej?S&=I`28n`rD4VSIrMk(CAYAyHT4{fW;At zTJqhOOxaXYyf<#~x5oy5WEp0hO|y{UdpCba-1@a&E$h}ynE(DW&!4Krn{?h*?d?0Y zY0K`r>)zfyShVwtuf<%ycUHc^IoqQd4m>R?{I~k*s?xKZKXt^o)ft}teBEo{rFpvb zbE|F_Q^qA!~8PrpRfL3=;jvb>*$}{z<9asoO8FQ^B#SIqUT*^N#(sC#F5$xmkPZn*Z7R zKQ`-}USoL7*7%r3{e8cthtI{&Y+93A-LkHxqmI=o;GShQOI%I{`-i!Uw{Bzj@a@~T zDR)1dmkg@sSUTluRJ72e(-+D`(@mh+( zVE*~o_4Qk$c)J3oE&c1^bI;5F@|D=%pE+#Is_dKs7-q2o1K|7byJy)0`scoLUo3ba zjU^-e$KQW<^RCZiaQw_EGP&y46z|I>dS-70_Hkb{?!O@Z-<hzhR{qRC##zn6=S{^AG1Ya-*sJMtSii1JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybes$1;o;uum9_jcCaNskP8j{mRZaLUYB_-#qa z{3}lsUsQH&;o)a2eW7W*a$%cLhGbNH;fduE?3)V8cU!N%@1yo_g0A-_ZB79eM<{BM zcX#1kIwjZd@3R66ml{1!p^(t0|Mul1FKBh&^=D%_=gUV`a|$=#RD7(h=*{>ThF)I7?@7yPqdDBlXovf_>drIohEc)zPY3K zlMR1fNa)mV5y>Np>c1{NF=9D+p=NrA{b7mZhpd8s?s#dQ?mhka&Lt)JrBlAz&+@*! z<)XS%a%@HET*G5h$!o6NT5Epn&P|Ws_wO>))!I2-H~(dCaO}qGuUrhh=||=s$j{SW z@Ah!>#i;1Dr61htB>u0eXW#dDCMzr)VFCK%`<7*GTdsX8vHE$qx2iEe)y?Oyt8zFT*HG>=DNQ5lT#&M?P|LwWz#P2 zq?x+&-PJ5s28sUT4dL@Ytk7$Gt#kU*xxlsU0gbyDfm*8Nw{sjXeDg0v+~McHxb@Hf zz5co@)I93Ta0|NZ-tt^3 znAa+7b7^0ZUv%S<)jxjye|9hbV!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo}pnEhuArwq8+Ibo@t(*S_~XO4l9EcBP#XEz+h9R)(VUw-0a zFko|&e#0-Me0}bZ%^TmJDOdmfEH{BYR%5A+Vw9T8X_vf+IY;7W(m?!RldGfG~M$QKQpEme4};W^t;-^CVoRX-g$6kGnB Y;kNAesroxlc@D@Up00i_>zopr0GKL*?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base.png b/Resources/Textures/_HL/Objects/Weapons/Guns/Ammunition/Projectiles/25x59mm.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..b56cbc151d062db66cb9a6f9dd849e68aa9d228b GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo}pnEhuArwq8+Ibo@t(*S_~XO4l9EcBP#$J%%x7oi-zl%JVYcM<}k^J9h z$-(?H-G|^OwuscH>uYs8X77{&qEgGS913 z?w2LDytSSc+JE)Z!c}ZnN`ody*gh!PC}79(M%a<-qiw=nz8yO@S?vE3v5qrWd}F2L jhMm>Yf182s`yDL5y(d>`7B^QYC Date: Tue, 17 Mar 2026 17:11:09 -0500 Subject: [PATCH 2/7] MercVend Commit 1 [ Changes how the in-file code around it are organized, adds the mining hardsuits, and adds the upgradeable backpacks ] --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 37 +++- .../AllTheAmmo/Intermediate_5.56x45mm.yml | 10 + .../_Mono/Recipes/Lathes/Packs/ammo.yml | 6 +- .../Inventories/weaponryworks.yml | 1 + .../_NF/Catalog/mercenary_uplink_catalog.yml | 185 ++++++++++++++---- Resources/Prototypes/_NF/Store/categories.yml | 40 ++-- Resources/Prototypes/_NF/Store/presets.yml | 12 +- 7 files changed, 232 insertions(+), 59 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 11bb54718ba..f6d30f595d7 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -300,11 +300,15 @@ uplink-pirate-pinpointer-target-scanner-desc = A jury-rigged scanner that can fi # region Mercvend store-category-mercenaryhardsuits = EVA Suits -store-category-mercenaryweapons = Weapons +store-category-mercenaryarmor = Armor store-category-mercenaryutility = Utility +store-category-mercenarymedical = Medical +store-category-mercenarysnipers = Snipers +store-category-mercenaryrifles = Rifles +store-category-mercenaryshotguns = Shotguns +store-category-mercenarysmgs = Sub-Machineguns +store-category-mercenaryhandguns = Handguns store-category-mercenaryammo = Ammunition -store-category-mercenaryexplosives = Explosives -store-category-mercenarybundles = Bundles uplink-mercenary-scafhardsuit-name = SCAF Hardsuit uplink-mercenary-scafhardsuit-desc = A suit of vacuum-proof armor highly resistant to projectile weaponry. @@ -315,14 +319,20 @@ uplink-mercenary-hardsuit-desc = A suit of space-proof armored vac suit that pro uplink-mercenary-hardsuit1-name = Private Security Hardsuit uplink-mercenary-hardsuit1-desc = A suit of space-proof armored vac suit that protects against general damage. -uplink-mercenary-rifle1-name = Surplus Lecter -uplink-mercenary-rifle1-desc = A tried and true surplus automatic rifle. The benchmark. +uplink-mining-hardsuit-name = mining hardsuit +uplink-mining-hardsuit-desc = A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. -uplink-mercenary-shotgun1-name = Surplus Kammerer -uplink-mercenary-shotgun1-desc = Old reliable, rack and shoot. Marked for Surplus. +uplink-luxurymining-hardsuit-name = luxury mining hardsuit +uplink-luxurymining-hardsuit-desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move. -uplink-mercenary-smg1-name = Surplus Drozd -uplink-mercenary-smg1-desc = Based on an old design, this SMG is still more than capable of putting rounds down-range. +uplink-backpack-tactical-name = tactical pack +uplink-backpack-tactical-desc = A tactical pack for your tactical needs. + +uplink-backpack-explorer-name = explorer pack +uplink-backpack-explorer-desc = Large pack for all your gear and supplies. + +uplink-backpack-rucksack-name = rucksack +uplink-backpack-rucksack-desc = Sacks to haul your burdens. uplink-mercenary-gauze-name = Gauze Roll uplink-mercenary-gauze-desc = A full roll of Gauze, for the merc on the go. @@ -360,6 +370,15 @@ uplink-security-syringe-case-desc = A pocket case filled with medipens for most uplink-mercenary-combat-burn-kit-name = Burn Kit uplink-mercenary-combat-burn-kit-desc = 4 Ready-made Burn injectors, man burns suck bad. +uplink-mercenary-surpluslecter-name = Surplus Lecter +uplink-mercenary-surpluslecter-desc = A tried and true surplus automatic rifle. The benchmark. + +uplink-mercenary-surpluskrammerer-name = Surplus Kammerer +uplink-mercenary-surpluskrammerer-desc = Old reliable, rack and shoot. Marked for Surplus. + +uplink-mercenary-surplusdrozd-name = Surplus Drozd +uplink-mercenary-surplusdrozd-desc = Based on an old design, this SMG is still more than capable of putting rounds down-range. + uplink-mercenary-35auto-mags-name = .35 Auto SMG mags uplink-mercenary-35auto-mags-desc = A quartet of SMG stick magazines loaded up with lethals, go get 'em tiger diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml index f88d809bebb..f79ad484460 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/AllTheAmmo/Intermediate_5.56x45mm.yml @@ -30,6 +30,16 @@ id: Magazine556x45mmUranium result: Magazine556x45mmUranium +- type: latheRecipe + parent: BaseAmmoUraniumIntermediateMagazineRecipe + id: MagazineNovaliteC1 + result: MagazineNovaliteC1 + +- type: latheRecipe + parent: BaseAmmoEmptyIntermediateMagazineRecipe + id: MagazineNovaliteC1Empty + result: MagazineNovaliteC1Empty + #Speedloaders - type: latheRecipe diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml index 7f354aa04ef..55a3dfb3748 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml @@ -113,6 +113,8 @@ - Magazine556x45mmPractice - Magazine556x45mmEmpty - Magazine556x45mmUranium + - MagazineNovaliteC1 + - MagazineNovaliteC1Empty - SpeedLoader556x45mmFMJ - SpeedLoader556x45mmRubber - SpeedLoader556x45mmIncendiary @@ -228,7 +230,7 @@ - Magazine8x65mmEmpty - Magazine762x54mmREmpty - Magazine762x51mmEmpty - - Magazine12_gaugeEmpty + - Magazine12_gaugeEmpty - Magazine45_ACPSubMachineGunTopMountedEmpty - Magazine9x19mmSubMachineGunTopMountedEmpty - Magazine57x28mmSubMachineGunTopMountedEmpty @@ -382,6 +384,8 @@ - AmmoBox762x51mmRubberBig - AmmoBox762x39mmRubberBig - AmmoBox762x54mmRRubberBig + - MagazineNovaliteC1 + - MagazineNovaliteC1Empty #civilian = FMJ + practice + empty + rubber diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml index f353c38d85c..5a15237bb1c 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml @@ -35,6 +35,7 @@ #SpeedLoader7.282x39mmFMJ: 28 # 7.282x39mm Gestio/AKM #SpeedLoader7.282x54mmRFMJ: 28 # 7.282x54mmR SVS SpeedLoader45_magnumFMJ: 28 # .45 magnum revolvers + MagazineNovaliteC1: 6 Magazine762x39mmLowCapacityFMJ: 28 ClothingBeltQuiverFullBodkin: 6 ClothingBeltQuiverFullBroadhead: 6 diff --git a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml index 1405471f87c..f0de7f3f241 100644 --- a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml @@ -1,3 +1,20 @@ +# EVA Suits +- type: listing + id: UplinkMercenaryHardsuitMining + name: uplink-mining-hardsuit-name + description: uplink-mining-hardsuit-desc + productEntity: ClothingOuterHardsuitSalvage + icon: { sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi, state: icon } + cost: + MercCoin: 5 + categories: + - UplinkMercenaryHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink + - type: listing id: UplinkMercenaryHardsuit name: uplink-mercenary-hardsuit-name @@ -37,7 +54,7 @@ productEntity: ClothingOuterHardsuitScaf icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi, state: icon } cost: - MercCoin: 32 + MercCoin: 25 categories: - UplinkMercenaryHardsuits conditions: @@ -47,55 +64,89 @@ - MercenaryUplink - type: listing - id: UplinkMercenaryWeaponSurpLecter - name: uplink-mercenary-rifle1-name - description: uplink-mercenary-rifle1-desc - productEntity: WeaponRifleSurpLecter - icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/surplecter.rsi, state: icon } + id: UplinkMercenaryHardsuitLuxuryMining + name: uplink-luxurymining-hardsuit-name + description: uplink-luxurymining-hardsuit-desc + productEntity: ClothingOuterHardsuitLuxury + icon: { sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi, state: icon } cost: - MercCoin: 8 + MercCoin: 30 categories: - - UplinkMercenaryWeapons + - UplinkMercenaryHardsuits conditions: - !type:StoreWhitelistCondition whitelist: tags: - MercenaryUplink +# Armor - type: listing - id: UplinkMercenarySurpKammerer - name: uplink-mercenary-shotgun1-name - description: uplink-mercenary-shotgun1-desc - productEntity: WeaponShotgunSurpKammerer - icon: { sprite: _NF/Objects/Weapons/Guns/Shotguns/surppump.rsi, state: icon } + id: UplinkMercenaryHardsuitLuxuryMining + name: uplink-luxurymining-hardsuit-name + description: uplink-luxurymining-hardsuit-desc + productEntity: ClothingOuterHardsuitLuxury + icon: { sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi, state: icon } cost: - MercCoin: 9 + MercCoin: 30 categories: - - UplinkMercenaryWeapons + - UplinkMercenaryArmor conditions: - !type:StoreWhitelistCondition whitelist: tags: - MercenaryUplink + +# Utility - type: listing - id: UplinkMercenarySurpDrozd - name: uplink-mercenary-smg1-name - description: uplink-mercenary-smg1-desc - productEntity: WeaponSubMachineGunSurpDrozd - icon: { sprite: _NF/Objects/Weapons/Guns/SMGs/surpdrozd.rsi, state: icon } + id: UplinkMercenaryUtilityBackpackTactical + name: uplink-backpack-tactical-name + description: uplink-backpack-tactical-desc + productEntity: ClothingBackpackTactical + icon: { sprite: _HL/Clothing/Back/tacticalpack.rsi, state: icon } cost: - MercCoin: 6 + MercCoin: 0 categories: - - UplinkMercenaryWeapons + - UplinkMercenaryUtility conditions: - !type:StoreWhitelistCondition whitelist: tags: - MercenaryUplink -#Utility - Medical +- type: listing + id: UplinkMercenaryUtilityBackpackExplorer + name: uplink-backpack-explorer-name + description: uplink-backpack-explorer-desc + productEntity: ClothingBackpackExplorer + icon: { sprite: _HL/Clothing/Back/explorerpack.rsi, state: icon } + cost: + MercCoin: 0 + categories: + - UplinkMercenaryUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink +- type: listing + id: UplinkMercenaryUtilityRucksack + name: uplink-backpack-rucksack-name + description: uplink-backpack-rucksack-desc + productEntity: ClothingRucksack + icon: { sprite: _HL/Clothing/Back/rucksack.rsi, state: icon } + cost: + MercCoin: 0 + categories: + - UplinkMercenaryUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink + +# Medical - type: listing id: UplinkMercenaryGauze name: uplink-mercenary-gauze-name @@ -105,7 +156,7 @@ cost: MercCoin: 2 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -121,7 +172,7 @@ cost: MercCoin: 2 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -137,7 +188,7 @@ cost: MercCoin: 2 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -153,7 +204,7 @@ cost: MercCoin: 6 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -169,7 +220,7 @@ cost: MercCoin: 8 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -185,7 +236,7 @@ cost: MercCoin: 10 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -201,7 +252,7 @@ cost: MercCoin: 10 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -217,7 +268,7 @@ cost: MercCoin: 10 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -233,7 +284,7 @@ cost: MercCoin: 10 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: @@ -249,13 +300,81 @@ cost: MercCoin: 10 categories: - - UplinkMercenaryUtility + - UplinkMercenaryMedical conditions: - !type:StoreWhitelistCondition whitelist: tags: - MercenaryUplink +# Snipers + +# Rifles +- type: listing + id: UplinkMercenaryWeaponSurpLecter + name: uplink-mercenary-surpluslecter-name + description: uplink-mercenary-surpluslecter-desc + productEntity: WeaponRifleSurpLecter + icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/surplecter.rsi, state: icon } + cost: + MercCoin: 8 + categories: + - UplinkMercenaryRifles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink + +# Shotguns +- type: listing + id: UplinkMercenarySurpKammerer + name: uplink-mercenary-surpluskrammerer-name + description: uplink-mercenary-surpluskrammerer-desc + productEntity: WeaponShotgunSurpKammerer + icon: { sprite: _NF/Objects/Weapons/Guns/Shotguns/surppump.rsi, state: icon } + cost: + MercCoin: 5 + categories: + - UplinkMercenaryShotguns + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink + +# SMGs +- type: listing + id: UplinkMercenarySurpDrozd + name: uplink-mercenary-surplusdrozd-name + description: uplink-mercenary-surplusdrozd-desc + productEntity: WeaponSubMachineGunSurpDrozd + icon: { sprite: _NF/Objects/Weapons/Guns/SMGs/surpdrozd.rsi, state: icon } + cost: + MercCoin: 6 + categories: + - UplinkMercenarySMGs + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink + +# Handguns + id: UplinkMercenarySurpDrozd + name: uplink-mercenary-surplusdrozd-name + description: uplink-mercenary-surplusdrozd-desc + productEntity: WeaponSubMachineGunSurpDrozd + icon: { sprite: _NF/Objects/Weapons/Guns/SMGs/surpdrozd.rsi, state: icon } + cost: + MercCoin: 6 + categories: + - UplinkMercenaryHandguns + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink # Ammo #- type: listing # HL Depreciated ammo type. diff --git a/Resources/Prototypes/_NF/Store/categories.yml b/Resources/Prototypes/_NF/Store/categories.yml index ffaab4fe657..e4611747aa5 100644 --- a/Resources/Prototypes/_NF/Store/categories.yml +++ b/Resources/Prototypes/_NF/Store/categories.yml @@ -49,26 +49,42 @@ name: store-category-pirateexplosives #mercenary -- type: storeCategory - id: UplinkMercenaryBundles - name: store-category-mercenarybundles - - type: storeCategory id: UplinkMercenaryHardsuits name: store-category-mercenaryhardsuits - type: storeCategory - id: UplinkMercenaryWeapons - name: store-category-mercenaryweapons - -- type: storeCategory - id: UplinkMercenaryAmmo - name: store-category-mercenaryammo + id: UplinkMercenaryArmor + name: store-category-mercenaryarmor - type: storeCategory id: UplinkMercenaryUtility name: store-category-mercenaryutility - type: storeCategory - id: UplinkMercenaryExplosives - name: store-category-mercenaryexplosives + id: UplinkMercenaryMedical + name: store-category-mercenarymedical + +- type: storeCategory + id: UplinkMercenarySnipers + name: store-category-mercenarysnipers + +- type: storeCategory + id: UplinkMercenaryRifles + name: store-category-mercenaryrifles + +- type: storeCategory + id: UplinkMercenaryShotguns + name: store-category-mercenaryshotguns + +- type: storeCategory + id: UplinkMercenarySMGs + name: store-category-mercenarysmgs + +- type: storeCategory + id: UplinkMercenaryHandguns + name: store-category-mercenaryhandguns + +- type: storeCategory + id: UplinkMercenaryAmmo + name: store-category-mercenaryammo diff --git a/Resources/Prototypes/_NF/Store/presets.yml b/Resources/Prototypes/_NF/Store/presets.yml index 84901b17c02..db9f731fb01 100644 --- a/Resources/Prototypes/_NF/Store/presets.yml +++ b/Resources/Prototypes/_NF/Store/presets.yml @@ -64,11 +64,15 @@ name: store-preset-name-merc-uplink categories: - UplinkMercenaryHardsuits - - UplinkMercenaryWeapons - - UplinkMercenaryAmmo + - UplinkMercenaryArmor - UplinkMercenaryUtility - - UplinkMercenaryExplosives - - UplinkMercenaryBundles + - UplinkMercenaryMedical + - UplinkMercenarySnipers + - UplinkMercenaryRifles + - UplinkMercenaryShotguns + - UplinkMercenarySMGs + - UplinkMercenaryHandguns + - UplinkMercenaryAmmo currencyWhitelist: - MercCoin balance: From 08e68c05e7d888788312da85772d215ae4d5284a Mon Sep 17 00:00:00 2001 From: Niko_de16 Date: Tue, 17 Mar 2026 18:13:50 -0500 Subject: [PATCH 3/7] MercVend Commit 2 [ Finishes off adding all the Utility Items, and updates the Seclight and Stun Baton to C1 (There's no reason these should have been C2 in the first place, they're utility/non-lethal) ] --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 56 ++++- .../Entities/Objects/Tools/flashlights.yml | 2 +- .../Entities/Objects/Weapons/security.yml | 2 +- .../_NF/Catalog/mercenary_uplink_catalog.yml | 218 ++++++++++++++++-- 4 files changed, 253 insertions(+), 25 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index f6d30f595d7..7ed90aa65ca 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -319,20 +319,56 @@ uplink-mercenary-hardsuit-desc = A suit of space-proof armored vac suit that pro uplink-mercenary-hardsuit1-name = Private Security Hardsuit uplink-mercenary-hardsuit1-desc = A suit of space-proof armored vac suit that protects against general damage. -uplink-mining-hardsuit-name = mining hardsuit -uplink-mining-hardsuit-desc = A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. +uplink-mercenary-mininghardsuit-name = mining hardsuit +uplink-mercenary-mininghardsuit-desc = A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. -uplink-luxurymining-hardsuit-name = luxury mining hardsuit -uplink-luxurymining-hardsuit-desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move. +uplink-mercenary-luxmininghardsuit-name = luxury mining hardsuit +uplink-mercenary-luxmininghardsuit-desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move. -uplink-backpack-tactical-name = tactical pack -uplink-backpack-tactical-desc = A tactical pack for your tactical needs. +uplink-mercenary-tactical-name = tactical pack +uplink-mercenary-tactical-desc = A tactical pack for your tactical needs. -uplink-backpack-explorer-name = explorer pack -uplink-backpack-explorer-desc = Large pack for all your gear and supplies. +uplink-mercenary-explorer-name = explorer pack +uplink-mercenary-explorer-desc = Large pack for all your gear and supplies. -uplink-backpack-rucksack-name = rucksack -uplink-backpack-rucksack-desc = Sacks to haul your burdens. +uplink-mercenary-rucksack-name = rucksack +uplink-mercenary-rucksack-desc = Sacks to haul your burdens. + +uplink-mercenary-webbing-name = chest rig +uplink-mercenary-webbing-desc = A set of tactical webbing worn by boarding parties. + +uplink-mercenary-mercwebbing-name = mercenary webbing +uplink-mercenary-mercwebbing-desc = Ideal for storing everything from ammo to weapons and combat essentials. + +uplink-mercenary-stunbaton-name = stun baton +uplink-mercenary-stunbaton-desc = A stun baton for incapacitating people with. Actively harming with this is considered bad tone. + +uplink-mercenary-bola-name = bola +uplink-mercenary-bola-desc = Linked together with some spare cuffs and metal. + +uplink-mercenary-boxhandcuff-name = handcuff box +uplink-mercenary-boxhandcuff-desc = A box full of handcuffs. + +uplink-mercenary-seclite-name = seclite +uplink-mercenary-seclite-desc = A robust flashlight used by security. + +uplink-mercenary-pinpointuni-name = universal pinpointer +uplink-mercenary-pinpointuni-desc = A handheld tracking device that locks onto any physical entity while off. Keep upright to retain accuracy. + +uplink-mercenary-bountyhud-name = bounty hunter hud +uplink-mercenary-bountyhud-desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status, criminal records and health status. + +uplink-mercenary-diagnostichud-name = diagnostic hud +uplink-mercenary-diagnostichud-desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. + +uplink-mercenary-medicalhud-name = medical hud +uplink-mercenary-medicalhud-desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status. + +uplink-mercenary-engigoggles-name = engineering goggles +uplink-mercenary-engigoggles-desc = Green-tinted goggles using a proprietary polymer that provides protection from eye damage of all types. + +uplink-mercenary-chemgoggles-name = chemical analysis goggles +uplink-mercenary-chemgoggles-desc = Goggles that can scan the chemical composition of a solution. uplink-mercenary-gauze-name = Gauze Roll uplink-mercenary-gauze-desc = A full roll of Gauze, for the merc on the go. diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index d02c77b0749..a110e6ab183 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -76,7 +76,7 @@ - type: entity name: seclite - parent: [FlashlightLantern, BaseC2ContrabandUnredeemable] # Frontier: BaseSecurityContraband Date: Wed, 18 Mar 2026 01:30:18 -0500 Subject: [PATCH 4/7] MercVend Commit 3 [ Adds all the armor I wanted to add, alongside finishes off the new printable ammo with Jackdaw Mags & Cobra Mag's now bring printable ] --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 42 ++++ .../Guns/Ammunition/Magazines/6.35x40mm.yml | 2 +- .../AllTheAmmo/Intermediate_5.56x45mm.yml | 2 +- .../Recipes/Lathes/AllTheAmmo/VariousAmmo.yml | 10 + .../_Mono/Recipes/Lathes/Packs/ammo.yml | 11 + .../_NF/Catalog/mercenary_uplink_catalog.yml | 220 +++++++++++++++++- 6 files changed, 279 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 7ed90aa65ca..f4bee122662 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -325,6 +325,48 @@ uplink-mercenary-mininghardsuit-desc = A special suit that protects against haza uplink-mercenary-luxmininghardsuit-name = luxury mining hardsuit uplink-mercenary-luxmininghardsuit-desc = A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move. +uplink-mercenary-riotshield-name = riot shield +uplink-mercenary-riotshield-desc = A large tower shield. Good for controlling crowds. + +uplink-mercenary-uparmorshield-name = +uplink-mercenary-uparmorshield-desc = + +uplink-mercenary-armorcoat-name = bounty hunter's flak trenchcoat +uplink-mercenary-armorcoat-desc = A greatcoat enhanced with a bulletproof alloy for some extra protection and style for those with a charismatic presence. + +uplink-mercenary-armorriot-name = riot suit +uplink-mercenary-armorriot-desc = A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. + +uplink-mercenary-webmercblack-name = mercenary web vest +uplink-mercenary-webmercblack-desc = A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. + +uplink-mercenary-webmercolive-name = mercenary web vest +uplink-mercenary-webmercolive-desc = A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. + +uplink-mercenary-armorbasic-name = armor vest +uplink-mercenary-armorbasic-desc = A standard Type I armored vest that provides decent protection against most types of damage. + +uplink-mercenary-armorhelmetmercblack-name = combat helmet +uplink-mercenary-armorhelmetmercblack-desc = The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the urban sprawl. + +uplink-mercenary-armorhelmetswat-name = SWAT helmet +uplink-mercenary-armorhelmetswat-desc = An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. + +uplink-mercenary-armorbulletproof-name = bulletproof vest +uplink-mercenary-armorbulletproof-desc = A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + +uplink-mercenary-armorhelmetbulletproof-name = bulletproof helmet +uplink-mercenary-armorhelmetbulletproof-desc = Protects the face against bullets, can flip up and down. + +uplink-mercenary-armorstabproof-name = stabproof vest +uplink-mercenary-armorstabproof-desc = Contrary to it's name, it's just a Type II armored vest that provides good protection against stabs and punches, but not much else. + +uplink-mercenary-armorhelmetstabproof-name = stabproof helmet +uplink-mercenary-armorhelmetstabproof-desc = The most "comfortable" security helmet, as rated by officers. Will take a blow to the head nicely, but a bullet'll go right through it. + +uplink-mercenary-armorhelmetriot-name = light riot helmet +uplink-mercenary-armorhelmetriot-desc = It's a helmet specifically designed to protect against close range attacks. + uplink-mercenary-tactical-name = tactical pack uplink-mercenary-tactical-desc = A tactical pack for your tactical needs. diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml index 168d0cc5157..9593d3cd379 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/Ammunition/Magazines/6.35x40mm.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazine635x40mmCaseless name: "magazine (635x40mm Caseless)" - parent: [ BaseCartridge, BaseC3SyndicateContrabandNoValue, RecyclableItemSteelTiny ] # Frontier: BaseSecurityContraband Date: Wed, 18 Mar 2026 03:48:56 -0500 Subject: [PATCH 5/7] MercVend Commit 4 [ Updated a some weapons to be C2 sense other weapons of similar caliber are also C2, Added all the guns already present in-game to the Vender that are worthy of being in there. Mostly C1/C2 weapons, fixed the new printable mags a wee bit, updated the copyright for the 25x59mm round, also fixes some error's in past commits with the round of bug-testing done in this commit ] --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 110 +++- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 2 +- .../Guns/Ammunition/Magazines/6.35x40mm.yml | 2 +- .../Objects/Weapons/Guns/registered.yml | 4 +- .../_NF/Catalog/mercenary_uplink_catalog.yml | 601 +++++++++++++++++- .../Weapons/Guns/Revolvers/revolvers.yml | 12 +- .../Weapons/Guns/Rifles/rifles_assault.yml | 2 +- .../Projectiles/25x59mm.rsi/meta.json | 2 +- 9 files changed, 697 insertions(+), 40 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index f4bee122662..21107b1c58c 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -328,9 +328,6 @@ uplink-mercenary-luxmininghardsuit-desc = A refurbished mining hardsuit, fashion uplink-mercenary-riotshield-name = riot shield uplink-mercenary-riotshield-desc = A large tower shield. Good for controlling crowds. -uplink-mercenary-uparmorshield-name = -uplink-mercenary-uparmorshield-desc = - uplink-mercenary-armorcoat-name = bounty hunter's flak trenchcoat uplink-mercenary-armorcoat-desc = A greatcoat enhanced with a bulletproof alloy for some extra protection and style for those with a charismatic presence. @@ -448,15 +445,120 @@ uplink-security-syringe-case-desc = A pocket case filled with medipens for most uplink-mercenary-combat-burn-kit-name = Burn Kit uplink-mercenary-combat-burn-kit-desc = 4 Ready-made Burn injectors, man burns suck bad. -uplink-mercenary-surpluslecter-name = Surplus Lecter +uplink-mercenary-surpluslecter-name = Surplus Lecter (5.56x45mm) uplink-mercenary-surpluslecter-desc = A tried and true surplus automatic rifle. The benchmark. +uplink-mercenary-repeaterrifle-name = N2524 Pattern Repeater (.45 magnum) +uplink-mercenary-repeaterrifle-desc = A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo. + +uplink-mercenary-gestiorifle-name = Gestio (762x39mm) +uplink-mercenary-gestiorifle-desc = An old burst-fire rifle made by Silver Industries that never left trials. Accepts low capacity 762x39mm magazines. + +uplink-mercenary-vulcancfcm-name = FCM-C Vulcan (762x51mm) +uplink-mercenary-vulcancfcm-desc = The "Vulcan" Civilian Medium combat rifle (Fusil de Combat Moyen Civil) in 762x51mm, this civilian version only has semi-automatic mode and reduced firerate. + +uplink-mercenary-lasercannonpmc-name = PMC Laser Cannon +uplink-mercenary-lasercannonpmc-desc = A laser cannon that has been properly registered for private security and mercenary use. + +uplink-mercenary-lasercannon-name = laser cannon +uplink-mercenary-lasercannon-desc = A heavy duty, high powered laser sniper rifle. On the handle is a label that says 'for authorized use only.' + +uplink-mercenary-energyriflebutbetter-name = laser carbine +uplink-mercenary-energyriflebutbetter-desc = A simple civilian grade laser carbine, the workhorse of many private security organizations. + +uplink-mercenary-tempaturegun-name = temperature gun +uplink-mercenary-tempaturegun-desc = An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime. + +uplink-mercenary-mr8crifle-name = MR-8C BR (8x65mm SKR) +uplink-mercenary-mr8crifle-desc = The BR variant of the MR-8 series, firing with incredible accuracy. Chambered in 8x65mm SKR. + +uplink-mercenary-vulcanrifle-name = Vulcan (762x51mm) +uplink-mercenary-vulcanrifle-desc = One of the heaviest small arms to grace Security's armory, this rifle is a modern take on a classic, informally dubbed the "Right Arm of the Free World". Uses 762x51mm ammo. + +uplink-mercenary-ceremonialrifle-name = ceremonial rifle (762x51mm) +uplink-mercenary-ceremonialrifle-desc = A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses 762x51mm ammo. + +uplink-mercenary-mosinrifle-name = Kardashev-Mosin (762x54mmR) +uplink-mercenary-mosinrifle-desc = A weapon for hunting, or endless trench warfare. Uses 762x54mmR ammo. Equipped with bayonet. + +uplink-mercenary-akrifle-name = AKM (762x39mm) +uplink-mercenary-akrifle-desc = An iconic weapon of war. Uses 762x39mm ammo. An illegal firearm often used by Syndicate agents. + +uplink-mercenary-assultakrifle-name = Soland-Moss (762x39mm) +uplink-mercenary-assultakrifle-desc = A heavy assault rifle designed to provide suppressive fire to enemy positions. All serial numbers have been expertly removed, rendering this rifle extremely illegal. Uses 762x39 magazines. + uplink-mercenary-surpluskrammerer-name = Surplus Kammerer uplink-mercenary-surpluskrammerer-desc = Old reliable, rack and shoot. Marked for Surplus. +uplink-mercenary-enforcershotty-name = Enforcer (12 gauge) +uplink-mercenary-enforcershotty-desc = A premium semi-automatic shotgun, and the pride of all security forces. Uses 12 gauge shotgun shells. + +uplink-mercenary-vortex12shotty-name = Vortex-12 (12 gauge) +uplink-mercenary-vortex12shotty-desc = Designed by SESWC. A semi-automatic magazine-fed shotgun for close-quarters combat + +uplink-mercenary-bigjohnnyshotty-name = Big Johnny (4 gauge) +uplink-mercenary-bigjohnnyshotty-desc = An old yet faithful design, and a favorite among irregular forces on many worlds. + uplink-mercenary-surplusdrozd-name = Surplus Drozd uplink-mercenary-surplusdrozd-desc = Based on an old design, this SMG is still more than capable of putting rounds down-range. +uplink-mercenary-c20rpmc-name = PMC C-20r (9x19mm) +uplink-mercenary-c20rpmc-desc = A C-20r that has been properly registered for private security and mercenary use. + +uplink-mercenary-disablersmgpmc-name = PMC Disabler SMG +uplink-mercenary-disablersmgpmc-desc = A disabler SMG that has been properly registered for private security and mercenary use. + +uplink-mercenary-novalitec1-name = Novalite C1 (556x45mm) +uplink-mercenary-novalitec1-desc = A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Uses 556x45mm ammo. + +uplink-mercenary-wt550-name = WT550 (46x30mm) +uplink-mercenary-wt550-desc = An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses 46x30mm ammo. On the receiver is a label that says 'for authorized use only.' + +uplink-mercenary-wt440-name = WT-440 (46x30mm) +uplink-mercenary-wt440-desc = A rarely seen modification of the WT550, this high capacity pistol is a cut-down version of the famous SMG, lacking an arm brace or alternate firemodes. Easier to conceal, and with all serial numbers expertly removed. Takes 4.6x30mm WT magazines. + +uplink-mercenary-typewriter-name = Typewriter (.45 ACP) +uplink-mercenary-typewriter-desc = A modern take on the classic design used by mobsters throughout space and time. Uses .45 ACP ammo. + +uplink-mercenary-ritland45-name = Ritland .45 (.45 ACP) +uplink-mercenary-ritland45-desc = An illegal revolver favoured by Syndicate agents. + +uplink-mercenary-ward45-name = Ward .45 (.45 ACP) +uplink-mercenary-ward45-desc = The iconic sidearm of the dreaded death squads. On the handle is a label that says 'for authorized use only.' + +uplink-mercenary-viperpmc-name = PMC Viper (9x19mm) +uplink-mercenary-viperpmc-desc = A Viper that has been properly registered for private security and mercenary use. + +uplink-mercenary-mk58-name = mk 58 (.45 ACP) +uplink-mercenary-mk58-desc = The Mark 58 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 ACP ammo. + +uplink-mercenary-deckard-name = Deckard (.45 magnum) +uplink-mercenary-deckard-desc = A beautifully machined, custom-built revolver. Used when there is no time for the Voight-Kampff test. Loads 5 rounds of .45 magnum. + +uplink-mercenary-laserpistol-name = laser pistol +uplink-mercenary-laserpistol-desc = An older model of civilian-grade laser pistol with two settings: disable and kill. + +uplink-mercenary-svalinn-name = svalinn laser pistol +uplink-mercenary-svalinn-desc = A cheap and widely used laser pistol. + +uplink-mercenary-advancedlaserpistol-name = advanced laser pistol +uplink-mercenary-advancedlaserpistol-desc = An experimental civilian grade high-energy laser pistol with a self-charging nuclear battery and two settings: disable and kill. + +uplink-mercenary-pollock-name = Pollock (9x19mm) +uplink-mercenary-pollock-desc = A compact and mass-produced combat pistol. Uses 9x19mm ammo. + +uplink-mercenary-mk32-name = Mk32 "Universal" (9x19mm) +uplink-mercenary-mk32-desc = A cheap, civilian grade, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses 9x19mm ammo. + +uplink-mercenary-n1984-name = N1984 (.45 magnum) +uplink-mercenary-n1984-desc = An exceptionally powerful ‘hand cannon’ designed as part of Nanotrasen's BFG initiative. Chambered in .45, the lord’s caliber, it is generally considered too unwieldy for standard use but has become something of a status symbol among Nanotrasen officials. Feeds from .45 pistol magazines. + +uplink-mercenary-fitz-name = Fitz Special (.45 magnum) +uplink-mercenary-fitz-desc = A compact and concealable self defence snub revolver. Uses .45 magnum ammo. + +uplink-mercenary-faith-name = Faith (.45 magnum) +uplink-mercenary-faith-desc = Delivers blessings in bullet form. Uses .45 magnum ammo. + uplink-mercenary-35auto-mags-name = .35 Auto SMG mags uplink-mercenary-35auto-mags-desc = A quartet of SMG stick magazines loaded up with lethals, go get 'em tiger diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 80f020c711a..2798459f69d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -53,7 +53,7 @@ - type: entity name: AKM (762x39mm) - parent: [BaseWeaponRifle, BaseC3SyndicateContraband] # Frontier: BaseSecurityContraband Date: Wed, 18 Mar 2026 04:16:15 -0500 Subject: [PATCH 6/7] MercVend Commit 5 [ Balances out the Merc Coin cost of all the new items around varrious varriables ] --- .../_NF/Catalog/mercenary_uplink_catalog.yml | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml index c412448617d..aa3c4ab95c0 100644 --- a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml @@ -22,7 +22,7 @@ productEntity: ClothingOuterHardsuitMercenary icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi, state: icon } cost: - MercCoin: 8 + MercCoin: 15 categories: - UplinkMercenaryHardsuits conditions: @@ -38,7 +38,7 @@ productEntity: ClothingOuterHardsuitPrivateSecurity icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi, state: icon } cost: - MercCoin: 8 + MercCoin: 15 categories: - UplinkMercenaryHardsuits conditions: @@ -54,7 +54,7 @@ productEntity: ClothingOuterHardsuitScaf icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi, state: icon } cost: - MercCoin: 25 + MercCoin: 35 categories: - UplinkMercenaryHardsuits conditions: @@ -70,7 +70,7 @@ productEntity: ClothingOuterHardsuitLuxury icon: { sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi, state: icon } cost: - MercCoin: 30 + MercCoin: 50 categories: - UplinkMercenaryHardsuits conditions: @@ -87,7 +87,7 @@ productEntity: RiotShield icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: riot-icon } cost: - MercCoin: 10 + MercCoin: 12 categories: - UplinkMercenaryArmor conditions: @@ -119,7 +119,7 @@ productEntity: ClothingOuterCoatBHTrench icon: { sprite: _NF/Clothing/OuterClothing/Coats/bounty_hunter_coat.rsi, state: icon } cost: - MercCoin: 8 + MercCoin: 15 categories: - UplinkMercenaryArmor conditions: @@ -135,7 +135,7 @@ productEntity: ClothingOuterArmorRiot icon: { sprite: Clothing/OuterClothing/Armor/riot.rsi, state: icon } cost: - MercCoin: 7 + MercCoin: 9 categories: - UplinkMercenaryArmor conditions: @@ -151,7 +151,7 @@ productEntity: ClothingOuterVestWebMercenaryBlack icon: { sprite: _NF/Clothing/OuterClothing/Vests/mercenary_webvest_black.rsi, state: icon } cost: - MercCoin: 4 + MercCoin: 6 categories: - UplinkMercenaryArmor conditions: @@ -167,7 +167,7 @@ productEntity: ClothingOuterVestWebMercenary icon: { sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi, state: icon } cost: - MercCoin: 4 + MercCoin: 6 categories: - UplinkMercenaryArmor conditions: @@ -183,7 +183,7 @@ productEntity: ClothingOuterArmorBasic icon: { sprite: Clothing/OuterClothing/Armor/security.rsi, state: icon } cost: - MercCoin: 5 + MercCoin: 8 categories: - UplinkMercenaryArmor conditions: @@ -215,7 +215,7 @@ productEntity: ClothingHeadHelmetSwat icon: { sprite: Clothing/Head/Helmets/swat.rsi, state: icon } cost: - MercCoin: 10 + MercCoin: 15 categories: - UplinkMercenaryArmor conditions: @@ -231,7 +231,7 @@ productEntity: ClothingOuterArmorBulletproof icon: { sprite: Clothing/OuterClothing/Armor/bulletproof.rsi, state: icon } cost: - MercCoin: 8 + MercCoin: 10 categories: - UplinkMercenaryArmor conditions: @@ -247,7 +247,7 @@ productEntity: ClothingHeadHelmetBulletProof icon: { sprite: _Starlight/Clothing/Head/Helmets/bulletproof.rsi, state: icon } cost: - MercCoin: 5 + MercCoin: 7 categories: - UplinkMercenaryArmor conditions: @@ -263,7 +263,7 @@ productEntity: ClothingOuterArmorStab icon: { sprite: _Starlight/Clothing/OuterClothing/Armor/stabvest.rsi, state: icon } cost: - MercCoin: 5 + MercCoin: 8 categories: - UplinkMercenaryArmor conditions: @@ -279,7 +279,7 @@ productEntity: ClothingHeadHelmetStabproof icon: { sprite: _Starlight/Clothing/Head/Helmets/stabproof.rsi, state: icon } cost: - MercCoin: 3 + MercCoin: 5 categories: - UplinkMercenaryArmor conditions: @@ -295,7 +295,7 @@ productEntity: ClothingHeadHelmetRiot icon: { sprite: Clothing/Head/Helmets/light_riot.rsi, state: icon } cost: - MercCoin: 5 + MercCoin: 8 categories: - UplinkMercenaryArmor conditions: @@ -313,7 +313,7 @@ productEntity: ClothingBackpackTactical icon: { sprite: _HL/Clothing/Back/tacticalpack.rsi, state: icon } cost: - MercCoin: 3 + MercCoin: 5 categories: - UplinkMercenaryUtility conditions: @@ -329,7 +329,7 @@ productEntity: ClothingBackpackExplorer icon: { sprite: _HL/Clothing/Back/explorerpack.rsi, state: icon } cost: - MercCoin: 4 + MercCoin: 7 categories: - UplinkMercenaryUtility conditions: @@ -345,7 +345,7 @@ productEntity: ClothingRucksack icon: { sprite: _HL/Clothing/Back/rucksack.rsi, state: icon } cost: - MercCoin: 5 + MercCoin: 9 categories: - UplinkMercenaryUtility conditions: @@ -361,7 +361,7 @@ productEntity: ClothingBeltMilitaryWebbing icon: { sprite: Clothing/Belt/militarywebbing.rsi, state: icon } cost: - MercCoin: 2 + MercCoin: 4 categories: - UplinkMercenaryUtility conditions: @@ -377,7 +377,7 @@ productEntity: ClothingBeltMercenaryWebbing icon: { sprite: Clothing/Belt/mercwebbing.rsi, state: icon } cost: - MercCoin: 2 + MercCoin: 4 categories: - UplinkMercenaryUtility conditions: @@ -393,7 +393,7 @@ productEntity: Stunbaton icon: { sprite: Objects/Weapons/Melee/stunbaton.rsi, state: stunbaton_off } cost: - MercCoin: 3 + MercCoin: 5 categories: - UplinkMercenaryUtility conditions: @@ -441,7 +441,7 @@ productEntity: FlashlightSeclite icon: { sprite: Objects/Tools/seclite.rsi, state: seclite } cost: - MercCoin: 1 + MercCoin: 3 categories: - UplinkMercenaryUtility conditions: @@ -457,7 +457,7 @@ productEntity: PinpointerUniversal icon: { sprite: Objects/Devices/pinpointer.rsi, state: pinpointer-crew } cost: - MercCoin: 2 + MercCoin: 5 categories: - UplinkMercenaryUtility conditions: @@ -473,7 +473,7 @@ productEntity: ClothingEyesHudBountyHunter icon: { sprite: Clothing/Eyes/Hud/sec.rsi, state: icon } cost: - MercCoin: 4 + MercCoin: 10 categories: - UplinkMercenaryUtility conditions: @@ -489,7 +489,7 @@ productEntity: ClothingEyesHudDiagnostic icon: { sprite: Clothing/Eyes/Hud/diag.rsi, state: icon } cost: - MercCoin: 4 + MercCoin: 10 categories: - UplinkMercenaryUtility conditions: @@ -505,7 +505,7 @@ productEntity: ClothingEyesHudMedical icon: { sprite: Clothing/Eyes/Hud/med.rsi, state: icon } cost: - MercCoin: 4 + MercCoin: 10 categories: - UplinkMercenaryUtility conditions: @@ -521,7 +521,7 @@ productEntity: ClothingEyesGlassesMeson icon: { sprite: Clothing/Eyes/Glasses/meson.rsi, state: icon } cost: - MercCoin: 2 + MercCoin: 5 categories: - UplinkMercenaryUtility conditions: @@ -537,7 +537,7 @@ productEntity: ClothingEyesGlassesChemical icon: { sprite: Clothing/Eyes/Glasses/science.rsi, state: icon } cost: - MercCoin: 2 + MercCoin: 5 categories: - UplinkMercenaryUtility conditions: @@ -717,7 +717,7 @@ productEntity: WeaponRifleSurpLecter icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/surplecter.rsi, state: icon } cost: - MercCoin: 8 + MercCoin: 15 categories: - UplinkMercenaryRifles conditions: @@ -733,7 +733,7 @@ productEntity: WeaponSniperRepeater icon: { sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi, state: base } cost: - MercCoin: 0 + MercCoin: 14 categories: - UplinkMercenaryRifles conditions: @@ -749,7 +749,7 @@ productEntity: WeaponRifleGestio icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 18 categories: - UplinkMercenaryRifles conditions: @@ -765,7 +765,7 @@ productEntity: WeaponRifleVulcanCFCM icon: { sprite: _Mono/Objects/Weapons/Guns/Rifles/WeaponRifleVulcanCFCM.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 22 categories: - UplinkMercenaryRifles conditions: @@ -781,7 +781,7 @@ productEntity: WeaponLaserCannonPMC icon: { sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 25 categories: - UplinkMercenaryRifles conditions: @@ -797,7 +797,7 @@ productEntity: NFWeaponEnergyRifleCannon icon: { sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 25 categories: - UplinkMercenaryRifles conditions: @@ -813,7 +813,7 @@ productEntity: NFWeaponEnergyRifleCarbineExpedition icon: { sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 22 categories: - UplinkMercenaryRifles conditions: @@ -829,7 +829,7 @@ productEntity: WeaponTemperatureGun icon: { sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 40 categories: - UplinkMercenaryRifles conditions: @@ -845,7 +845,7 @@ productEntity: WeaponRifleMR8C icon: { sprite: _Mono/Objects/Weapons/Guns/Rifles/mr8c.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 40 categories: - UplinkMercenaryRifles conditions: @@ -861,7 +861,7 @@ productEntity: WeaponRifleVulcan icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/vulcan.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 36 categories: - UplinkMercenaryRifles conditions: @@ -877,7 +877,7 @@ productEntity: WeaponSniperCeremonial icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi, state: base } cost: - MercCoin: 0 + MercCoin: 24 categories: - UplinkMercenaryRifles conditions: @@ -893,7 +893,7 @@ productEntity: WeaponSniperMosin icon: { sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi, state: base } cost: - MercCoin: 0 + MercCoin: 16 categories: - UplinkMercenaryRifles conditions: @@ -909,7 +909,7 @@ productEntity: WeaponRifleAk icon: { sprite: Objects/Weapons/Guns/Rifles/ak.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 28 categories: - UplinkMercenaryRifles conditions: @@ -925,7 +925,7 @@ productEntity: NFWeaponRifleAssaultSm icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/solandmoss.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 28 categories: - UplinkMercenaryRifles conditions: @@ -942,7 +942,7 @@ productEntity: WeaponShotgunSurpKammerer icon: { sprite: _NF/Objects/Weapons/Guns/Shotguns/surppump.rsi, state: icon } cost: - MercCoin: 5 + MercCoin: 12 categories: - UplinkMercenaryShotguns conditions: @@ -958,7 +958,7 @@ productEntity: WeaponShotgunEnforcer icon: { sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 16 categories: - UplinkMercenaryShotguns conditions: @@ -974,7 +974,7 @@ productEntity: WeaponShotgunVortex icon: { sprite: _HL/Objects/Weapons/Guns/Shotguns/vortex.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 22 categories: - UplinkMercenaryShotguns conditions: @@ -990,7 +990,7 @@ productEntity: WeaponShotgunBigJohnny icon: { sprite: _Mono/Objects/Weapons/Guns/Shotguns/BigJohnny.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 40 categories: - UplinkMercenaryShotguns conditions: @@ -1007,7 +1007,7 @@ productEntity: WeaponSubMachineGunSurpDrozd icon: { sprite: _NF/Objects/Weapons/Guns/SMGs/surpdrozd.rsi, state: icon } cost: - MercCoin: 6 + MercCoin: 10 categories: - UplinkMercenarySMGs conditions: @@ -1023,7 +1023,7 @@ productEntity: WeaponSubMachineGunC20rPMC icon: { sprite: Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 32 categories: - UplinkMercenarySMGs conditions: @@ -1039,7 +1039,7 @@ productEntity: WeaponDisablerSMGPMC icon: { sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi, state: base } cost: - MercCoin: 0 + MercCoin: 8 categories: - UplinkMercenarySMGs conditions: @@ -1055,7 +1055,7 @@ productEntity: WeaponRifleNovaliteC1 icon: { sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 11 categories: - UplinkMercenarySMGs conditions: @@ -1071,7 +1071,7 @@ productEntity: WeaponSubMachineGunWt550 icon: { sprite: Objects/Weapons/Guns/SMGs/wt550.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 14 categories: - UplinkMercenarySMGs conditions: @@ -1087,7 +1087,7 @@ productEntity: WeaponPistolWT440446x30mm icon: { sprite: _HL/Objects/Weapons/Guns/Pistols/wt440.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 20 categories: - UplinkMercenarySMGs conditions: @@ -1103,7 +1103,7 @@ productEntity: WeaponSubMachineGunTypewriter icon: { sprite: _DV/Objects/Weapons/Guns/SMGs/typewriter.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 17 categories: - UplinkMercenaryHandguns conditions: @@ -1120,7 +1120,7 @@ productEntity: Ritland45Mercenary icon: { sprite: Objects/Weapons/Guns/Revolvers/python.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 28 categories: - UplinkMercenaryHandguns conditions: @@ -1136,7 +1136,7 @@ productEntity: Ward45Mercenary icon: { sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 28 categories: - UplinkMercenaryHandguns conditions: @@ -1152,7 +1152,7 @@ productEntity: WeaponPistolViperPMC icon: { sprite: Objects/Weapons/Guns/Pistols/viper.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 18 categories: - UplinkMercenaryHandguns conditions: @@ -1168,7 +1168,7 @@ productEntity: WeaponPistolMk58 icon: { sprite: Objects/Weapons/Guns/Pistols/mk58.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 10 categories: - UplinkMercenaryHandguns conditions: @@ -1184,7 +1184,7 @@ productEntity: WeaponRevolverDeckard icon: { sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi, state: base } cost: - MercCoin: 0 + MercCoin: 28 categories: - UplinkMercenaryHandguns conditions: @@ -1200,7 +1200,7 @@ productEntity: NFWeaponEnergyPistolLaser icon: { sprite: _NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 10 categories: - UplinkMercenaryHandguns conditions: @@ -1216,7 +1216,7 @@ productEntity: WeaponLaserSvalinn icon: { sprite: Objects/Weapons/Guns/Battery/svalinn.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 8 categories: - UplinkMercenaryHandguns conditions: @@ -1232,7 +1232,7 @@ productEntity: NFWeaponEnergyPistolLaserAdvanced icon: { sprite: _NF/Objects/Weapons/Guns/Battery/advancedlasergun.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 15 categories: - UplinkMercenaryHandguns conditions: @@ -1248,7 +1248,7 @@ productEntity: WeaponPistolPollock icon: { sprite: _DV/Objects/Weapons/Guns/Pistols/pollock.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 18 categories: - UplinkMercenaryHandguns conditions: @@ -1264,7 +1264,7 @@ productEntity: WeaponPistolMk32 icon: { sprite: Objects/Weapons/Guns/Pistols/mk32.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 12 categories: - UplinkMercenaryHandguns conditions: @@ -1280,7 +1280,7 @@ productEntity: WeaponPistolN1984 icon: { sprite: Objects/Weapons/Guns/Pistols/N1984.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 35 categories: - UplinkMercenaryHandguns conditions: @@ -1296,7 +1296,7 @@ productEntity: WeaponRevolverFitz icon: { sprite: _DV/Objects/Weapons/Guns/Revolvers/fitz.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 18 categories: - UplinkMercenaryHandguns conditions: @@ -1312,7 +1312,7 @@ productEntity: WeaponRevolverFaith icon: { sprite: _DV/Objects/Weapons/Guns/Revolvers/faith.rsi, state: icon } cost: - MercCoin: 0 + MercCoin: 18 categories: - UplinkMercenaryHandguns conditions: From c3751298fcca33faa6ae53cec101c90049dc1030 Mon Sep 17 00:00:00 2001 From: Niko_de16 Date: Wed, 18 Mar 2026 04:57:01 -0500 Subject: [PATCH 7/7] Fixes Linter Fail 1? [ Forgot to add a new tag for the new Forktail round. Thanks Trylo for helping! ] --- Resources/Prototypes/_HL/tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_HL/tags.yml b/Resources/Prototypes/_HL/tags.yml index 05eebd4b6d8..509beccf6bc 100644 --- a/Resources/Prototypes/_HL/tags.yml +++ b/Resources/Prototypes/_HL/tags.yml @@ -357,6 +357,9 @@ - type: Tag id: GaslockFrameMachineCircuitBoard +- type: Tag + id: Cartridge25x59HE + # Forged Rifle Mag - type: Tag id: ForgedRifleMagazine