From c0c6fc3cd4cf66e1ad332ea13912fbc606a00809 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:23:31 +0000 Subject: [PATCH 01/21] Merge pull request #3 from AU-14/weapons M41 + Smartgun --- .../Guns/Rifles/m54c/jungle.rsi/base.png | Bin 619 -> 679 bytes .../Guns/Rifles/m54c/jungle.rsi/bolt-open.png | Bin 619 -> 679 bytes .../m54c/jungle.rsi/equipped-BACKPACK.png | Bin 760 -> 1109 bytes .../m54c/jungle.rsi/equipped-SUITSTORAGE.png | Bin 557 -> 646 bytes .../Guns/Rifles/m54c/jungle.rsi/icon.png | Bin 619 -> 705 bytes .../Rifles/m54c/jungle.rsi/inhand-left.png | Bin 694 -> 962 bytes .../Rifles/m54c/jungle.rsi/inhand-right.png | Bin 716 -> 958 bytes .../Guns/Rifles/m54c/jungle.rsi/mag-0.png | Bin 224 -> 220 bytes .../m54c/jungle.rsi/wielded-inhand-left.png | Bin 672 -> 965 bytes .../m54c/jungle.rsi/wielded-inhand-right.png | Bin 666 -> 956 bytes .../Guns/SmartGuns/smart_gun.rsi/Icon.png | Bin 754 -> 308 bytes .../Guns/SmartGuns/smart_gun.rsi/base.png | Bin 627 -> 308 bytes .../SmartGuns/smart_gun.rsi/bolt-open.png | Bin 627 -> 308 bytes .../smart_gun.rsi/equipped-BACKPACK.png | Bin 1136 -> 1110 bytes .../smart_gun.rsi/equipped-SUITSTORAGE.png | Bin 1136 -> 1110 bytes .../SmartGuns/smart_gun.rsi/inhand-left.png | Bin 1007 -> 828 bytes .../SmartGuns/smart_gun.rsi/inhand-right.png | Bin 977 -> 818 bytes .../Guns/SmartGuns/smart_gun.rsi/mag-0.png | Bin 282 -> 184 bytes .../smart_gun.rsi/wielded-inhand-left.png | Bin 1089 -> 828 bytes .../smart_gun.rsi/wielded-inhand-right.png | Bin 1069 -> 818 bytes 20 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/base.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/base.png index 81149550c9b398f2ca958568ffa0da1ca5609802..bfeffaa7573148ebbb6a298471682436810bcd22 100644 GIT binary patch delta 666 zcmV;L0%iT{1g8a%8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00LP_L_t(| zob6RzOB+!TorPL-+XfP1YZ4(Xf)F)eY3L6q6#AZ@);M@B>-B7YDOhzJZNkW4207xn~Q zbbs?T&Xb9F;2GCz>KM)sel@InAt1#U7v|{j=$K>E=@d<+rUK8M9G~bI&K3MoNDL%k z7T@0et`#^qJYp40;GU@r_KZS86R_eX=^CXY2h09}iWP{Sl<8V$+i8GqbEamX(BfW0646ptskNUc`m z?qx;i>l>TYZk=12fOID7g>em40y9@JyZ?IP9kRO2bfXENDTQ^K7Bt!ueN5W#UNTpJVS;K@# z+-!R62Y+}#F!t2G)ul)-MFBCPAoN3ojp(pkF6#~Md5^aF#sEF@jq}=Wd6smCwb5wM zFoY5SQ!vLW^AcbLFkc|1K14G6Q4mT%F=tPhayMz4`lOpo%T25uRzDo>~kXKn^Q|6eBAGBar0<#L`eU$X^P~O1E*nn{X#7vNS)&&rA zCIQ(Xzyvgf39K^6(gMhW>M}Gi0LdmVQ9Bak_xB8tdCAkoF~q|E?Zn8UBL*BU6C-+r z?*HFYnW1^U#^))6r}#A{Uvt&df4Tp0a?5jG`nGRd@3p5c@3p^rO<0#C7p{1xNcHEX zo`lR>#x+-tD$5<(QS@!8N%v`&Sy{yl5J0J|$JOU@OO*$r3JM^}KVOw|32L&^{1lu~O?%%DD+9MeIEBi$ZN* zO+H|C)#~f6tIpT#Hge3(tUNx~{;cq9gWmXGayeO%^X`A{bAQeJkLBUMdWP21>Xz}F R@`wXw4(q3 diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/bolt-open.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/bolt-open.png index 81149550c9b398f2ca958568ffa0da1ca5609802..bfeffaa7573148ebbb6a298471682436810bcd22 100644 GIT binary patch delta 666 zcmV;L0%iT{1g8a%8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00LP_L_t(| zob6RzOB+!TorPL-+XfP1YZ4(Xf)F)eY3L6q6#AZ@);M@B>-B7YDOhzJZNkW4207xn~Q zbbs?T&Xb9F;2GCz>KM)sel@InAt1#U7v|{j=$K>E=@d<+rUK8M9G~bI&K3MoNDL%k z7T@0et`#^qJYp40;GU@r_KZS86R_eX=^CXY2h09}iWP{Sl<8V$+i8GqbEamX(BfW0646ptskNUc`m z?qx;i>l>TYZk=12fOID7g>em40y9@JyZ?IP9kRO2bfXENDTQ^K7Bt!ueN5W#UNTpJVS;K@# z+-!R62Y+}#F!t2G)ul)-MFBCPAoN3ojp(pkF6#~Md5^aF#sEF@jq}=Wd6smCwb5wM zFoY5SQ!vLW^AcbLFkc|1K14G6Q4mT%F=tPhayMz4`lOpo%T25uRzDo>~kXKn^Q|6eBAGBar0<#L`eU$X^P~O1E*nn{X#7vNS)&&rA zCIQ(Xzyvgf39K^6(gMhW>M}Gi0LdmVQ9Bak_xB8tdCAkoF~q|E?Zn8UBL*BU6C-+r z?*HFYnW1^U#^))6r}#A{Uvt&df4Tp0a?5jG`nGRd@3p5c@3p^rO<0#C7p{1xNcHEX zo`lR>#x+-tD$5<(QS@!8N%v`&Sy{yl5J0J|$JOU@OO*$r3JM^}KVOw|32L&^{1lu~O?%%DD+9MeIEBi$ZN* zO+H|C)#~f6tIpT#Hge3(tUNx~{;cq9gWmXGayeO%^X`A{bAQeJkLBUMdWP21>Xz}F R@`wXw4(q3 diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-BACKPACK.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-BACKPACK.png index ed5a332bc2a19c51ec3f61ce1ef20558f187ce00..913d694d385e37da1e11ee9042dd056bc376aa83 100644 GIT binary patch delta 1099 zcmV-R1ho731=R?U8Gi-<0063Kaozv`010qNS#tmY4#WTe4#WYKD-Ig~00aj~L_t(| zob8%lNK;W9$A1f93`wR*wM{FD2t~<1i)Pe|5tY%?9-@a{Bj`Qop@--p2z-p5q6dj6 zs2)O{Xp2a6K#F4-K#F4-K#F4-K#C)6fYVvbVzIc53LK}?sl^$Sj#J72i1+!9QXmjWd(D;e zr`W3x5eoLd&6-Iaw=T2Omu{xCf3Uumz5h71`r7C7Q79CWHo?#U-t+ku-*Wf>>kGY0 zF#+N$+%En6?0?res;{k~=lvmqc-f3KG{C441k`q~JFDWsO8X4Yho7{u3)k+Fx2b_{ z-)Xm%mzS}s3O9|6j!DPO`L9V3;?XPF7SG`(^d^a~+T~&B`IoPUXlZGg%#44qVFS<$ z43{Y%WI(>egNdn#eni@%=OO+< z>oL06*GK34XYe}nt3WbH`+SK9cDqBL@G$0)_N67obhh&u?b}m9fu5l0_DmUo**+H& zo`~=9ALMpzr^w74{aUhVLn5KS&zHii%>lVs>Wrwau4aC}pTglV4Ge_Ht<43|Xp|aj zcGID~Zht!Bt0QfRG}WfG0r?j1@pw|iH#htA{Qh4i5>1p)v!s zKz}F~tQC*<21iD1H4RP7+xWL|3JrrJ>HkR<8i2-Do*EV$c*PjOY)`4NyoRL$!zW_0~T^q&SuVq&SuVq&UhO@CULPes&I# Rm(>6O002ovPDHLkV1o7r7DWI6 literal 760 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y3J7pZNXaNGYm1BXyV>hcn4FT8*C4dxvNswRge-yxQ<<5+SKq<}wkH}&M2EM}}%y>M1MG8<*ti&~6n999M?Mpgz!Aj=DgrJ-z) z|1=nx!QxCnwjm=E10Rr%0^-be7O;2*kPQL}Kn&6kqfxA60EW*5b_N!pyn&Ii0pkLQ znIQG73n1o90v-3g&T_KiVa(mnnxjYqd0z4gsj z=|;iZ$2AQSm1?3k1}}u(xZf$QDq$&ZZcey#?o}m!8ryR|MtiONN8gS(xHVt>eUXJp zyoXotz_E%a+@SpSUu)ykOt0)#_}K4a$q-<9Skc zi8!`gH(FIMz2MI-@y0sNC;vqES$VR>=+3y3+@#SV*UVkhL<2hTHi`@g#Ol}^W ztL$NY;<9|RrpaWEPnrdD4_um&@ag%3mZgRV%OjfZi!b@Y`S!_8zEBJ4bWm`6y85}S Ib4q9e0G2TL761SM diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/equipped-SUITSTORAGE.png index f539a5af30c9406dff2b57f336fe65abc8019c74..7a18748c9667cede0d5e2711deb6d86020bd9c14 100644 GIT binary patch delta 632 zcmV-;0*C#r1cn8W8Gi-<0063Kaozv`010qNS#tmY4#WTe4#WYKD-Ig~00KBkL_t(| zob8&;N+UrOg^!R;lz_${CW;VnAtES<;>L{-5O?!7K7ubGu4d)RXK>*{1yOiYV2RXTMtP>u;ghT+?$QYxeli1taqRFKRkP9p3Gp-8;i-YiijB$N^Osz>1AQx7gorW)dELGy| z{i>`nX!iERjeo{pN*B-sELSSnI6uXofB*6L@W?9rG4Z?FgBxRYcLz*p0#-IR-QAf_ zx5JK*fF>gDIJ zOuTVe^-uTir263}!0%oQr;^?kM%?7kX#*iGsr_8{&Gf6Z75{+SJ1KRObX5hQ=ngBV!?=+0e08N0eY(P6$nE`tQpqw}0<@f0* SYy=hn0000k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zX63j`N=mA!$xN7>vfR|n$;D7vSy@6#1}Ojkz3vVm#aR;M7yKUz z7=ryPgg}A?9+AZi415Pcm~qF%?6*Kcu@cvalHmNblJdl&REB`W%)AmkKi3ciQ$54) z&EF>jRcuL(@J#dc)MDTOa#$Ip7+Dz@fh;c|mWHxH{?K4#28%NR*@lcv417R33Wzh? zS-|2MKsE^6EMsJN0rW16MzN9sC^3PZfd#0}z{uEuaRJ0kkbSHRAm&U0vO$0eXetv} zWss!>kOkFcXkY-672LTxVm+T3$YD!7T^vIq+}}>S$aTbkgJrGRtpEQXnJMhmzRT>Y zA!DI07}@q>vPt)r1+3j-TM|AlV{msYPnHp_f3I**u5aFgcm47__3sQnx!vw*D%}?VhfF JF6*2UngD-*nREaE diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/icon.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/icon.png index 81149550c9b398f2ca958568ffa0da1ca5609802..d90c435de7e09af714e4e98dacb0532f0c65a531 100644 GIT binary patch delta 692 zcmV;l0!#ht1i=N68Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00MJKL_t(| zob6U!YZE~fy@4w2)&>$&(JHTZ{{%G`q)dH2muLx{n{1U-r423)qIXtax0S{wWb{2)^hwu2+6lw;rZ*aw1_ z%Vi{>eYA}2cDqz87TJafAZw8kYS_f=MuT(t25Sfo*?(mXc>V4@rBZ1Q(r&jod$Gv; z+4C1P92_PL0m)44*m{R5HZbP|#}jLKw~0Xk08&R;1P}Fqc7h3RL}|K0p`ezRvqmmy zI-C;Budik4?c#ZAt2w&ce9GB<{YLuxi<~9o2OvEl@&m)cByOk#AR!7MI2_h$HLBO^ z%o?2!$AA64M+XP{RO)^(d(WJ8j%6v5OHe?XP!M?$VIwkcG#X}udpMzOpBO3Ek~7bC zIPemZ9c-`HqiKjF0H$CLEAMz4`lOpo%T25uRzDo>~kXKn^Q|6eBAGBar0<#L`eU$X^P~O1E*nn{X#7vNS)&&rA zCIQ(Xzyvgf39K^6(gMhW>M}Gi0LdmVQ9Bak_xB8tdCAkoF~q|E?Zn8UBL*BU6C-+r z?*HFYnW1^U#^))6r}#A{Uvt&df4Tp0a?5jG`nGRd@3p5c@3p^rO<0#C7p{1xNcHEX zo`lR>#x+-tD$5<(QS@!8N%v`&Sy{yl5J0J|$JOU@OO*$r3JM^}KVOw|32L&^{1lu~O?%%DD+9MeIEBi$ZN* zO+H|C)#~f6tIpT#Hge3(tUNx~{;cq9gWmXGayeO%^X`A{bAQeJkLBUMdWP21>Xz}F R@`wXw4(q3 diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-left.png index d0ff900804e8c35e91f9cc77955b052991d1a10d..db5220881897b141b6951487fbcc8606000a752f 100644 GIT binary patch delta 951 zcmV;o14#U~1;PiA8Gi-<0063Kaozv`010qNS#tmY4#WTe4#WYKD-Ig~00VSML_t(| zob8%TXcIvk#s2|sLdZ>%6qTZAkf;aI)S}`C6e5V&Ll8acp;xJR(H^X~7Ox&G^q?X= zRHR^_;0JnX3OS^rR8c}GO{3@`!Bi~@jx~S`#~MI}V+|m~u?A2Z5ekJ^xm*sY+-KVu0P%@Lf-;$mQWM(3fU|u^ z+3f2N5KrN7n791oCM+v4L5l&nTH^ijgL~=W^b5}?3(;b`XR~v(ExL({#bQ9Ec%a+> zh`)I56g_#FrGM_O&D7o9wML8#=#T9L*x%TL$Ig3|;(?YCAjH3V``)?wqc^T#L`azc z@rQa3(BRO>YTwb@_XF-xr4r=^V1X)dvDNBVI+HvGGZ@6knBW$_Z}(1?d-E>f-Y;oD z+afs7dzgm#u)TKq64AtzW5VFTdDdt;h+!|pUr3#%+<(vr=|;;M0MU0Rrf4F0f>O8c zICGef2$s(;I@6*aqJ8_;2s?RXKi%Zp`GJ-ZaF2_}8jwmqbyn|3>F2a(*AB`rex&ce z>W^f!<9qZ&e{5IaQ$`GZ9XCNh+Zs?PesVrzE%;nnA^eU9gF&h;|ERki+VMU5RhL&* z+r{G7R)1?i&B?L|zj;|&Dp5Qhr~dwanw*?u^YinoePXc~Lwh!xrJ0!wMIvD;l}g$~ zyU~6p2oa1C>*+~2;sC^skB>9l*hHhzHR46TN=3hT;LEKr#BfmzS5}yS;m!?k{=2Wd zpW=aU&jNo$v09Os3VeDv?U*KhiU+PRAJ#3T^aMJ?=OI!r?9abwSz$Ev2z$GXb)oj)=^F8&N|j zl@{oqjsS>nCKDiwJ3D|<8tRB5I{>`q2b3GoOeR1UcljJeRMZiXMQ8=(26)W`$Wogf zz<-rT5%o*uTT3N0>BOC_5mI_us4mt`qrdCO{V5*#T_< ziS;r8vitEPJD}}Wc)d)3EPiAMv_1MHwSV2&fsT6`^olir499o_ Zegh*pZYaV)??nIr002ovPDHLkV1ft*y`}&F literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=y^79Lbi}OoJ$xN7>VqxK!mE-Q@Vz|geR#{nFO-%-B9}XD2{24z1g*gj6B8wRq_zr_G z*AN9$J;U$K-zNiAY)OsqO!M^AV&DLBSQ(@kSs56CEH5CIhO$Ba(O_f-i!%Y)hKx)M zd_X!1h%?(+z~UJ|HV7mDF-Sj*MzN9s7# zpeamXl|hykKo(S&p@9KNHhGEKks!anXMlF8db&7WubNd1qKMmO4N6-j={E75!l*!?`+z1joYx3v9YLpECP6J9eB9sIxe^ zf>)y>GDR*o_KXKN>&#%DdkPC{jilO|l#6+?*e>cV_{}KB)M+V@DU};!bzJVfg6Cbv zK#9{)lCQV_Ra@u4xU|_c;KIGHUHvTn8!VW<+Gf0qz4mMKsU%ymEw&=(YV;;XP2D09 z!}+TBw>Z}y@$zZ>^ERSF`AXt;I6IS^Mwq{b{~IgBXZ}`T?_dg;t!N# zF5R6VHtGHQ2b10%J5f1*(+|F7CFTL=oDWWU=XU;Q+}@i9=e#>M^Yh}LtenqE%oENX wR`z+BcVN!(ChuL+-{-`0%-hUbudnfxHSFlj?zI(KyFr2H>FVdQ&MBb@0F^@8WdHyG diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/inhand-right.png index 21b1db16d85b2d7fb6e4c4f38c5a8b5d075cd74d..b9eaefa7e2c5604caaffa04e5ae586c478fbe765 100644 GIT binary patch delta 947 zcmV;k15EtP1-=K68Gi-<0063Kaozv`010qNS#tmY4#WTe4#WYKD-Ig~00VGIL_t(| zob8%TXwzUE#-BoOh0&X~9V$c7AyW^couc9g3?_)U!w@~{VON=WQ4h|W!>b2{9sC$Q zRAjKhzz_7Y4tj7RR8Yo{byf6`;-(IS*F4cTWVIhj6U&G!3p8WHs>GO|5 zakK$Y9Blv;M;ide(FQFULMRM~$73Rq zNKiatu^5i+-z^?bzjS3nO#{yK9TCrG=j?T_rPWFdW5qnSkAllBsSRt6n>y;5QPlu` zsjI8g8qY6&!heawdvR}kQmlUyfQ8~`TsV6Yqjw%!?^8!T6aF!P8y`5h55w1QMYe8E zid{Rl;pwY9+6hy9#5o?laaowdswS*4z$t#u&h3I{{>jt}d@X-p*O!2k%HyOC>ZxUd zZGbF$DgON6Dcrn$7uWjxFfuibc7-~SnXpV49y%u~FMkKyfH&{nTT7Nb&pgFv`j6wv z+-qFDbdl?#U8=wdb#P8tUj8QL=NE0A65D_uzarLz$7`NtZ_cI|oO;Gv3La!8&@MQC z3~@{y)I(j=N1aY=1D02QqNAe&vu{6`<5hbDc}p?cXbzxoxo)0$d?~M5x~Pvjomd8R zcXx|{fqwzy^Lfn7HJzb&8uWuU0E(jxfPdm>1E4tC04R<&0E(jxfZ}Kapg7t9 zD2^us7(>etGAy_@;735HQXm~d@?%;4p^GkhRSklZ#UG=uC{2s*3qbO}_JKQlK* z=Utr}8|LtSaP}*h`ww*Az9vB_o`EBU*URCXrLtcE0n@YrEX4&=EVH-M{YPm=-5kCd zs($j*K`I(P^pixjdFOe)aq9VdZP6`2e2!PG|J(<(x_h{D123bmmJ;;t?X9_>{*~u z4)1n9t?pL{^kJx84)2y$_bUYcG*~N#cPvY*`xXAnG$tINAUx&TkRU VYsMrUJxKrn002ovPDHLkV1o4@uB`w7 literal 716 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=y^79KwNXdwc^G}$ZVqxLvV!)B6(Gf3 z666>B9}XD2{24z1g*gj6B8wRq_zr_G z*AN9$J;U$K-zNiAY)OsqO!M^AV&DLBSQ(@kSs56CEH5CIhO$Ba(O_f-i!%Y)hKx)M zd_X!1h%?(+z~UJ|HV7mDF-Sj*MzN9s7# zpeamXl|hykKo(S&p@9KNHhGEKks!anXMlEDd%8G=M7Y15cCe3Gk;8$}eeJ*h?CTY* zvaAv@Mn_l4W=~id7Qguu`@Yb>ab)@F`2>OzI`*-39H_Bj{fV* zmU9Uh-jMNAyxD0P$Y}Li)5C)O3D+Dcmxg1JTFVdQ&MBb@02@KtasU7T diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/mag-0.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/mag-0.png index d8c35445c1648fffda0f03aedef81d5500317f46..6981d202fdb971edd674ebd9404e29ed864c7c6d 100644 GIT binary patch delta 203 zcmaFBc!zOUE|6j?3Gxg64+0FE_b=HG6yYrJh%9Dc;5!1sj8nDw zq=ABto-U3d7XHZzstghrST7u0!Q{dr5z4@LCG5a~6Gx8pC^@ZS5@SnCGw}}GdB&%w s$45g+Le0Qn!-9?puefy*JTw>>9_|%hzkJhc6QF4fp00i_>zopr04&cwng9R* delta 207 zcmV;=05JdD0pJ0U8Gi-<0047(dh`GQ00DDSM?wIu&K&6g005dvL_t(oh3(TZ4#F@D z1<(&-sX91A9aW`U#?CNv1CGgY7&~(VA`xXY3oBAdieUI}cKmHi0f>l*h~Bsyj&?hr z?ALS9*KKMZ_rqvyBS<+Srw3xZf81|d8?Ne$!-2vJgfJNZs7QLu^R+m(v>aIaV+cI$6J%9OQzV@a2-s~Fz=|07CIpJXYuj# z7q6D?c~)0cz%W@j^WT@Nk++`ic{b<6>}52%VCe3|Esqyw+z3$l3 zAWh}zrz5{v^iTe~jL9H@&D_?u*GElRW}&e6YSj=e`@)xpHdN?YUdir#X;OBymb3Y} z%`)Z;(Z0tON^f^9jL>;E`}oPaV8$JvY+kr*jdHb+sXz9+Kfd7eud7n+6=vbLrOFpA z7cSbkV$aJ4#{PmD6(PeVFY*@5e_FItjZb|R*M`u4aIWw?7*&XQX5QiJo}shgQsS92|BB~3T(IR_$C?qc z{`}e;g^3cI<|Xn@tYuzQl_OX4?t5JO!Cgs9e{pZjn7_i%Z1uM-i`5TqW$1nNb>(E{ z-@lj}>;m1UYai`0n(MXv@}lz%N~Wu?Z(ppwaH(!U{QCNDX?Jbzb=FtwO!9I&&#OFB zMnv;;l`Zqas?V1N(~j+ph*=|YdA_#G#xtQNZ)(}t3vbwR?yF_L;5c)cQAJ$3 z*QviR(&FXH{G0Nb3^I1=HydlrWxqQ4!EA>1i~0gByni)$j$UMPDBQvjAfwA5@?767 Xs@+K-rFs@Hdop;s`njxgN@xNAo!YXt literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwN=V5lD{J%f3#h5dWaYR|n4Dr^;ppUIC@#(~Ai%xc)C{Qb^JSi! zK#Hd%$S?Rm0x$^OKX(o&&RO6QS%FBlnwHe1|u_AoC(M_ zWMpFC1JY4IoY~F-7S8~(K_CH$LHc1dij@q&Fqy#4zyg#vFfuk^TmUf>q@HyF#GFY$ zHV7~QO<@A746?KUvY@&Q4GciC$xGCZ1o{0v1GJ0V)5S3)!u{=3_ol-NJg%V{O1u8o zx~ur`Fk6(C{gQTQbN~3Lu}*^BV!<)Scs2&6y*zKk3OWo80;KI`G9O?R-XNHCCeUkj z*~zt`yldC~WEJodm^Nvqa&$T4gll;WA+JP@x}VgX)IMN!TvWi|rnZoR(D(e}d38!x zo=yo7*4%dM@SnS#6M~}tcYa;COl$97>H9s*G69bn*soYTn9rbAIp>x2_w%MkuHomm zC!W6c*LFcir)`|*`~sCXckP+Ze3)n{E?g_HC%^pJKf#2g^GZ3-Ib!%u&fU46y}{_= z*$-;J4xX?6{=N3f?Ax!8?5jI_?(bulrYSxja!pd7{>xk*ykCFc*#>ctZ8aPLe;IA& WFF&fVE_fy=h&)~WT-G@yGyworFVQpr diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-right.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi/wielded-inhand-right.png index b973ded24c2903c0a1be1c172ed691f61773bb0d..b501684ef058eefe0ff1a0f137ce527dabc15531 100644 GIT binary patch delta 945 zcmbQmx`%y&WIY=L1H-D!!h1l9v%n*=n1O-s2naJy)#j6CU|`Pkba4!+nDcg)Z?*5yd+VPS7NBx~2%y&f0FSV9DWY?Oe73tD_ zMBgiTmS5B=pX^Io9>;&jRUKBDk&@=KytO)hhL2J4yL#K_HpTf87SB0MrZX~}O=WN> zmSngP!^VKbjpKFKpHr-M?DC85W2@GQuMMqy`|u0TCVBhq4;zkJ{5|rJv%#ybu#nY1 zK6TZ*sb2PluaBAD*;_0;V_qSj6w_moPcrVY3?D1*NXp3_`}4;p{=Lq6;p$aY_SK%^;awhc-#HgONIAOf@J+$_wm&|+)V8wjKb<`-wXyH=OB17+ zJuNCs4e=NESIa#As&s7SkssO5SB4(ebtt-f_b#7${nMcOe`UTh@1O29{&=tJ?unm@ zDwF?K{CUEvG_fPbwB%ftAxJ5Vm zafN|k@rxHXUqsrxdU3RQ=k+4doSZymsotjOcK>u=SzY=E|F0?zxRCcjiA$UYwX$uq@Oyn z*6}|O3;55gRT=kua!|G2iF^O!FWOIj-y`N!v>pYtLeUgo+#DPR_ zs}*Nf8z99YT9m@M^`IDMWfMr-&rrMZ&$?&pz8;@c8xY^f&~j7%f#1BN;i0WzUf;g| ze8*XE+PJ~s7we1WQrob$$Xk!TcYgGqQT^HP-t#-|<+oeUyQKQ$t^fC8xw?V?MBPbW zUtiDYLt*=NY|@LDnN+sb?(a7i7AA+c<@*`t+wk9-b~@E^TD`%}r6L?&qA64T=DzrF zRrtZQbcVz)+#6O{T3Wu;h@Q8ziDS~P@~2vP`RgB6ee3p_mHKP%jDM1=#Vgqa!uB`Z zp7wmN(wf7fX5SZgEQ*Mf*5AzAz4>ev)19oF)eftFv4$v5xjn5|my;teKJs?*-`$;2 zYzg~+vx=~Mzn9+{#ir1sRoD3ULtFVdQ&MBb@0Cj=1VE_OC literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwN=V7@^9v{|YpbcrWaYR|n4BUYz%4G$@8n`=Vd1#k)C{O_{Xy$E zAjMM>=PdAuEM{QfI}E~%$MaXD00qTLTq8Eaj?;r@2&>21vlJg%P^giihc z|K2xBC+gzr)vGtZ;hc4(_r(K;-;)Gd4sagiXK8TQzT|cyi=U4#_G^Tk<0~SA^?t z;8>BEyLOTGv|Fmj44l?lSpS~)mGAc5b@G4DuDw22ut~r|k)u(#NuG0=V7}@czVD?5 z{XfEazwO*8Hpj(AebsrlZGxJ6U*)i}3-&*e)jV}=+v((kjz^Tm?3*@q+&Z!Ffy$$| z*Szj2KIv~~TQ0~SSNk=$V1w)*^+#(%Umu@;<86u5$I18N3MK@P8;^2==cK0tps)L>4nJ z@ErkR#;MwT(m=spPZ!4!i+caJ6CC*t8*s4L-i>YlzkdhU$}7j#P6^JJj5pvpQE`Pe z*>}yILkIV_9JIC(jk9^8btjBFp!Tur^~DUP6Oz(oJaSU`TUVVjJY1}mbLhr2o-;nG zAHS6NA2?;V)w3hnGw{eq53LNY$Qw_SWe)1PY@DO}CjDlH#jU6J7Fq9SS-;X)*53Zr eBJ;YXWLCRIA2k3vjlt8^&t;ucLK6UW#%+}V delta 741 zcmV0kj6_n(WK8L}un+FScK=0QOE^&8LrF02rSb zVrKSw5?fu~p;+8WI-XWaA%wtjoM!Hg*4MsKFm!r%eSho?4*)48&mWld-@L^A`CZO; zrP%xvbKPx9#R`Vek&Lc3=KBHhh#bcu6>p!$S;B!Ylv0dO3}M?ntS+w;1XXmsoreQe z`mdQhdiew24=@a!-o9>1#R|S3(1>B^b^eKIi${>l<*e8(>(nQ zPu`wmu75C%Vdw-wmG3(dK~QCEY?4eSTXznEDpL9>(=-XgFclvu`1=v5^@36=F;VOX z-`}IJuZyW$!-+9#XCB{g+cveP6GGs+ZW6EUc+-~GipgfPY;A4fc^*TEWGKgGu=@%jyEP?F`$p7DHvnHhD4>&4v2tXA<48AK zY)n=zm+RuCVg-P~4u!kdahkdbr~Vg|iWOe(T{zP9C#7izjw3GUubsYdixw?f{4@Lp X0grCwtXJS!00000NkvXXu0mjff-YNT diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/base.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/base.png index c2d201c33fe4765534626a72374d725ec2fba52f..14f07b9234ff1eed0f9c97e5717d2e1b19fe3e01 100644 GIT binary patch delta 292 zcmey&vW01aWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKQ04 zzqmLL4^Ne*rmwHBq@<*Qfk9qg-pZ9Lf%000LQ{YgXGxG>@P8;^2==cK0tps)L>4nJ z@ErkR#;MwT(m=spPZ!4!i+caJ6CC*t8*s4L-i>YlzkdhU$}7j#P6^JJj5pvpQE`Pe z*>}yILkIV_9JIC(jk9^8btjBFp!Tur^~DUP6Oz(oJaSU`TUVVjJY1}mbLhr2o-;nG zAHS6NA2?;V)w3hnGw{eq53LNY$Qw_SWe)1PY@DO}CjDlH#jU6J7Fq9SS-;X)*53Zr eBJ;YXWLCRIA2k3vjlt8^&t;ucLK6UW$8D7W delta 613 zcmV-r0-F7_0`mlr8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00J#ZL_t(oh3%BVYt%p# z#(!HE8-yj~&<+btAwo4pkb+^6QhM{G)PwBbBKU6z-aVH71JdnLJk3ptX%8*#ER^Xk z4k1`0*o}vF#_V>hJ@jV2%Y%7u-uv=>Zvr)H)cD`gxUEK>=YN$!5CCv;a&qIobGJnR zKnOvSB(&S@@>U3}JbGL{d$Dz;*{t)TC>m*+qLiZB?cSJ#lWNw5@%Rh?-*36IEX&EV zp8y0wfH8)mC|n=U^U64m3B!N0oApnpHa_vf8;)m)b4Sc{~TH0<-4 z_7X1k!WhH)#wu~V$lmTgd45ikBuFWpq~q}!zTaYLd4WNHNS5VH!}nVg`*X#DBuVJ? zdSwst_oA@VOwju=QQKLqU8vnv?mdR0?wA{h900000NkvXXu0mjfX`3@h diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/bolt-open.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/bolt-open.png index c2d201c33fe4765534626a72374d725ec2fba52f..14f07b9234ff1eed0f9c97e5717d2e1b19fe3e01 100644 GIT binary patch delta 292 zcmey&vW01aWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKQ04 zzqmLL4^Ne*rmwHBq@<*Qfk9qg-pZ9Lf%000LQ{YgXGxG>@P8;^2==cK0tps)L>4nJ z@ErkR#;MwT(m=spPZ!4!i+caJ6CC*t8*s4L-i>YlzkdhU$}7j#P6^JJj5pvpQE`Pe z*>}yILkIV_9JIC(jk9^8btjBFp!Tur^~DUP6Oz(oJaSU`TUVVjJY1}mbLhr2o-;nG zAHS6NA2?;V)w3hnGw{eq53LNY$Qw_SWe)1PY@DO}CjDlH#jU6J7Fq9SS-;X)*53Zr eBJ;YXWLCRIA2k3vjlt8^&t;ucLK6UW$8D7W delta 613 zcmV-r0-F7_0`mlr8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00J#ZL_t(oh3%BVYt%p# z#(!HE8-yj~&<+btAwo4pkb+^6QhM{G)PwBbBKU6z-aVH71JdnLJk3ptX%8*#ER^Xk z4k1`0*o}vF#_V>hJ@jV2%Y%7u-uv=>Zvr)H)cD`gxUEK>=YN$!5CCv;a&qIobGJnR zKnOvSB(&S@@>U3}JbGL{d$Dz;*{t)TC>m*+qLiZB?cSJ#lWNw5@%Rh?-*36IEX&EV zp8y0wfH8)mC|n=U^U64m3B!N0oApnpHa_vf8;)m)b4Sc{~TH0<-4 z_7X1k!WhH)#wu~V$lmTgd45ikBuFWpq~q}!zTaYLd4WNHNS5VH!}nVg`*X#DBuVJ? zdSwst_oA@VOwju=QQKLqU8vnv?mdR0?wA{h900000NkvXXu0mjfX`3@h diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/equipped-BACKPACK.png index 3a60c7ab6a8d6f9232d295efe688ac5a19961c71..70fe16c7c7e0a7b756a32e9470d0bf2fce5c72cb 100644 GIT binary patch delta 1089 zcmV-H1it(52-XOYB!3BTNLh0L01m_e01m_fl`9S#000CCNklh!~pyI`{mi$nLIo^$aFg06DN4cF@GW8=;%lWgMoZ}e8|ho zi+I69jtK!pQOM)tWBv4mha3|EzP`TxdV0Y_jtK$S9)f!&h>@O-aMf`vI`MF8L;1OaW|ydogj7u0GlU2XY<~90N!5{q2O6>9N(a% zq#%g^wQ=4;xLE|x6e>MQ2ycUs9%9`KQW60w0O5ndV1D<<9xZQZ-yu8!i*I{f;*$s< z-f{!0l7EphRDg|pR)d!z+%Udj-F4RT0ZK&I_^u|nRf!PhM>=eU>S|_r6(0yG>N^LMiJoAm-j-du78aLPz1rDSoh_1ki{7Ju5>OnK?mp|5X(2q5wk(GIJ*0jSmaVbgZkyweAfst&sp)O_~ej zf`615f|Ug5)R*N{Ru@p6b#QA{`o59?;=lIXh_9QT11Pk6gx_kq6((hZo}=)VND0|1 z3BZ%4+^m4-s9cIXbdKp)t|VY)J0+$N(|Xo9fzfCrUEn);=&G|sP1kqRR9NQ(xsQ;x@D@dgtimzS4w zovKq%E*5K3%6E+fkPE=*$;pY_-QCr*0s6Pa9`L4Lyd0LPnuT zo*1buO?&{exg06t>#_yA4v(ucyy`@jH#ax7H9;LsLGUIQM$ru&bz&@rgeWIi5jx=d zzd&9vbAln0(+w_*t8V6H@&7dwv@TLY@vbH)TaFz8vgP;#l7{vr5s+Hm00000NkvXX Hu0mjf?+^G7 delta 1115 zcmV-h1f=`c2=EAyB!2;OQb$4nuFf3k000CkNkl6vzKP3R|qqhJd@V zATtM9VmG6Zg`Ac>Et5rXX23)C6YNPa2SEgHf)_8#!r*=YkA47A+Jm&>X%3ACEeD5Q zCd)M0ZHQ%tu@`a6!&tF*=$Woc(%p&VcWgS9f4_R~<<-k;pnsvEq0YFjD_qwVd9Pn7 zQ_QkpjOD&o%K$|zJul)oUbckgLMau5kjib$+@X{T`QxPlD5ctl&u4FkG)?Ur%!_`%-?A(Vn|C%~7?&^{4qJKjX&GQR9JaLYFlU@M)&Kz8 z+uK5Vg$^&3Eq`cH5JJRgG{VWBf8ptq1kazZAdX`kA0L0BvrcX60N?k~ZnyE{55E*z zrdz!<~LTO9zv+S(fOgh1^KKq(cT=YcT>(=^d;UxQ(+VsCFRS4CJm10+d; zZnul^c-#X1OM-b(&gzb1i~aq_m3j)et}9MXM&LY!VSlW`UcZXRhfe_joTrFmK2xu< z2i(7VrGV7(A%uuHj&XQ6!gpW1i8TEipMQ86_wQbTy?zyjv8uF=vH`X}{kc-R4*)?B zz%)%9e1BR2ezV`fSHJ6pMD23GB!j^KmSy3CFaN+tAHReBUn4N~Bntx-Dz~euIF2pe zd;e_!z<r{3ZLWt0HuX$owMz+%{E0?p+lO)j&10|-pRv3m$3kyoA2*dD&ZqQ_NL>1)_ zm}b?%V4!oa(wV$JrBwL7Kffe6jVOwWTwa(cihr`0Pm&~;o?6!d0N{BZ2qD7v{l#~P z^E4sLzW>?AXhTCoLqkJD`4k;QSQL~}EuAl`eld1K=r5qqF$$47o5EzfgEzVN_CGNh=s<$_9RCedja(nYec|8JISX9~d&q4?h zuInm=!G$3}DHTBwyfBDR2X5Z#fH8(32xcbja}6K|5qiB|Hi%Fc+U;vFO%uId51!{; zXoPc1;mJV+N~tJ1h_Fabwf=;Dzu#hv6@L$1*L8*C*tN+4j$@a1aPzlz1R+HExmpEe zr`X@xDV78Q;L+d_fD)gp3qWd>+Dll_s9gw5zC67MrAp8+R?+QTFQ#gNbUW9}pAljQ zN2r4rIF2pY!IAR!XBxoY+7Xh!~pyI`{mi$nLIo^$aFg06DN4cF@GW8=;%lWgMoZ}e8|ho zi+I69jtK!pQOM)tWBv4mha3|EzP`TxdV0Y_jtK$S9)f!&h>@O-aMf`vI`MF8L;1OaW|ydogj7u0GlU2XY<~90N!5{q2O6>9N(a% zq#%g^wQ=4;xLE|x6e>MQ2ycUs9%9`KQW60w0O5ndV1D<<9xZQZ-yu8!i*I{f;*$s< z-f{!0l7EphRDg|pR)d!z+%Udj-F4RT0ZK&I_^u|nRf!PhM>=eU>S|_r6(0yG>N^LMiJoAm-j-du78aLPz1rDSoh_1ki{7Ju5>OnK?mp|5X(2q5wk(GIJ*0jSmaVbgZkyweAfst&sp)O_~ej zf`615f|Ug5)R*N{Ru@p6b#QA{`o59?;=lIXh_9QT11Pk6gx_kq6((hZo}=)VND0|1 z3BZ%4+^m4-s9cIXbdKp)t|VY)J0+$N(|Xo9fzfCrUEn);=&G|sP1kqRR9NQ(xsQ;x@D@dgtimzS4w zovKq%E*5K3%6E+fkPE=*$;pY_-QCr*0s6Pa9`L4Lyd0LPnuT zo*1buO?&{exg06t>#_yA4v(ucyy`@jH#ax7H9;LsLGUIQM$ru&bz&@rgeWIi5jx=d zzd&9vbAln0(+w_*t8V6H@&7dwv@TLY@vbH)TaFz8vgP;#l7{vr5s+Hm00000NkvXX Hu0mjf?+^G7 delta 1115 zcmV-h1f=`c2=EAyB!2;OQb$4nuFf3k000CkNkl6vzKP3R|qqhJd@V zATtM9VmG6Zg`Ac>Et5rXX23)C6YNPa2SEgHf)_8#!r*=YkA47A+Jm&>X%3ACEeD5Q zCd)M0ZHQ%tu@`a6!&tF*=$Woc(%p&VcWgS9f4_R~<<-k;pnsvEq0YFjD_qwVd9Pn7 zQ_QkpjOD&o%K$|zJul)oUbckgLMau5kjib$+@X{T`QxPlD5ctl&u4FkG)?Ur%!_`%-?A(Vn|C%~7?&^{4qJKjX&GQR9JaLYFlU@M)&Kz8 z+uK5Vg$^&3Eq`cH5JJRgG{VWBf8ptq1kazZAdX`kA0L0BvrcX60N?k~ZnyE{55E*z zrdz!<~LTO9zv+S(fOgh1^KKq(cT=YcT>(=^d;UxQ(+VsCFRS4CJm10+d; zZnul^c-#X1OM-b(&gzb1i~aq_m3j)et}9MXM&LY!VSlW`UcZXRhfe_joTrFmK2xu< z2i(7VrGV7(A%uuHj&XQ6!gpW1i8TEipMQ86_wQbTy?zyjv8uF=vH`X}{kc-R4*)?B zz%)%9e1BR2ezV`fSHJ6pMD23GB!j^KmSy3CFaN+tAHReBUn4N~Bntx-Dz~euIF2pe zd;e_!z<r{3ZLWt0HuX$owMz+%{E0?p+lO)j&10|-pRv3m$3kyoA2*dD&ZqQ_NL>1)_ zm}b?%V4!oa(wV$JrBwL7Kffe6jVOwWTwa(cihr`0Pm&~;o?6!d0N{BZ2qD7v{l#~P z^E4sLzW>?AXhTCoLqkJD`4k;QSQL~}EuAl`eld1K=r5qqF$$47o5EzfgEzVN_CGNh=s<$_9RCedja(nYec|8JISX9~d&q4?h zuInm=!G$3}DHTBwyfBDR2X5Z#fH8(32xcbja}6K|5qiB|Hi%Fc+U;vFO%uId51!{; zXoPc1;mJV+N~tJ1h_Fabwf=;Dzu#hv6@L$1*L8*C*tN+4j$@a1aPzlz1R+HExmpEe zr`X@xDV78Q;L+d_fD)gp3qWd>+Dll_s9gw5zC67MrAp8+R?+QTFQ#gNbUW9}pAljQ zN2r4rIF2pY!IAR!XBxoY+7Xr-G{rbO$Ki8~2nj+nP<89gQdu<#2nzw&t@lxE+JV#*X7uMrntIlrFy*@#p@KZwm zhcESCt_X?O<>%$KP2Sz`CvEe_#~*K4@7TY8`{kEctW(a^l;78Se6RD_9*GpDMN0j$ zFU)33{eQ6k^Tqqhi##@8k8IITh&xy{A>fgs*xFQ{U6+%%`*>ysGqCtD)I?O+JvuB} zRHyvRHE;LbTc=N-7TB}Ts7x`!|3g&$x9gJ(Ti!5bX4hw{OuHX{Qc-VijNPWlA4eBt zO1PfxAxxKled>xy8@uzf4lU;n~HnXW}z{mIP7UVUkL@B2ZuD0J@WeJm^&=Qsq4UpbYfswZ?HJdTxPMUL*H z8kL@3>>C(YUH)y^d-@*B{eFepoAenM)-EvZvllzS9^B;PAmdSa_5IFp+j%-at!!;M znUeoZ*~=NFT)$@Z*Lu~810N?X>+xh-k;wSNYr`hZq*q2CkDRh&zWTCOp7AedaFy_> zeJt-DUNAW;@IvCcJm-Qo)&;xlFBIxlvz}6Z@tY^BwCZO4_1OWhy&Ib2T7G%;d^Npd z@Kbhy`G*_P|0ape*s1Yb$gAW|lxoH+{fjA#1r|@&{?a#WPyQ#k2^dOpkYM`2^oPlR WTi=7*YnGNU0D-5gpUXO@geCxdbcA03 delta 985 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 diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/mag-0.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/mag-0.png index 2b009efb4c339e0316acc5eedf4a0da9c8f52db1..607e444eba2635b4c5bb5b7901d94512b90fb629 100644 GIT binary patch delta 143 zcmbQmw1aViVLeN_qpu?a!^VE@KZ&di3=EtF9+AZi419+{nDKc2iWH!rucwP+NQC>_ z3k!JKkM)4{?xKXck?7;R_>H%~1{)=yV&??Zx!SLYyIys+}uY?6xpZ8h0>TPW~ u|FSbacWS53{5o;s+iv^gH9)f-ui4^djyV9JEbnddo737R*Kx&A!<1E^!+8`0H-wi23w>sVwkl8*k9v*{?|+cS8M^@M1XbYJ$`L#*b~wO1K~-Y+ r93qXgkF7Mt+CUXpocO^)2=Oys47W+x#`l6%00000NkvXXu0mjf9$Rj` diff --git a/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-left.png b/Resources/Textures/_RMC14/Objects/Weapons/Guns/SmartGuns/smart_gun.rsi/wielded-inhand-left.png index 734968a2d4abd4cacd9f4bffc7873621a5a063d8..0e3bfd7889c56f2a586085a98179ef6bb96e02a8 100644 GIT binary patch delta 805 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 S!5eb`0000 Date: Thu, 27 Mar 2025 16:59:16 -0700 Subject: [PATCH 02/21] Merge pull request #39 from troytroy400/equipment-rework PvE Hat/Helmet Ports --- .../Clothing/Head/Helmets/marine_helmets.yml | 120 ++++++++++++++++++ .../_AU14/Entities/Clothing/Head/hats.yml | 76 +++++++++++ .../booniehat.rsi/equipped-HELMET.png | Bin 0 -> 522 bytes .../DesertHats/booniehat.rsi/icon.png | Bin 0 -> 254 bytes .../DesertHats/booniehat.rsi/meta.json | 18 +++ .../DesertHats/cap.rsi/equipped-HELMET.png | Bin 0 -> 541 bytes .../Clothing/DesertHats/cap.rsi/icon.png | Bin 0 -> 249 bytes .../Clothing/DesertHats/cap.rsi/meta.json | 18 +++ .../flapcap.rsi/equipped-HELMET.png | Bin 0 -> 686 bytes .../Clothing/DesertHats/flapcap.rsi/icon.png | Bin 0 -> 297 bytes .../Clothing/DesertHats/flapcap.rsi/meta.json | 18 +++ .../m10corpsmanhelmet.rsi/equipped-HELMET.png | Bin 0 -> 998 bytes .../DesertHats/m10corpsmanhelmet.rsi/icon.png | Bin 0 -> 373 bytes .../m10corpsmanhelmet.rsi/meta.json | 18 +++ .../m10helmet.rsi/equipped-HELMET.png | Bin 0 -> 904 bytes .../DesertHats/m10helmet.rsi/icon.png | Bin 0 -> 346 bytes .../DesertHats/m10helmet.rsi/meta.json | 18 +++ .../m10mphelmet.rsi/equipped-HELMET.png | Bin 0 -> 970 bytes .../DesertHats/m10mphelmet.rsi/icon.png | Bin 0 -> 408 bytes .../DesertHats/m10mphelmet.rsi/meta.json | 18 +++ .../m11helmet.rsi/equipped-HELMET.png | Bin 0 -> 913 bytes .../DesertHats/m11helmet.rsi/icon.png | Bin 0 -> 361 bytes .../DesertHats/m11helmet.rsi/meta.json | 18 +++ .../m30pilothelmet.rsi/equipped-HELMET.png | Bin 0 -> 875 bytes .../DesertHats/m30pilothelmet.rsi/icon.png | Bin 0 -> 405 bytes .../DesertHats/m30pilothelmet.rsi/meta.json | 18 +++ .../m50tankerhelmet.rsi/equipped-HELMET.png | Bin 0 -> 983 bytes .../DesertHats/m50tankerhelmet.rsi/icon.png | Bin 0 -> 405 bytes .../DesertHats/m50tankerhelmet.rsi/meta.json | 18 +++ .../booniehat.rsi/equipped-HELMET.png | Bin 0 -> 524 bytes .../JungleHats/booniehat.rsi/icon.png | Bin 0 -> 256 bytes .../JungleHats/booniehat.rsi/meta.json | 18 +++ .../JungleHats/cap.rsi/equipped-HELMET.png | Bin 0 -> 542 bytes .../Clothing/JungleHats/cap.rsi/icon.png | Bin 0 -> 250 bytes .../Clothing/JungleHats/cap.rsi/meta.json | 18 +++ .../flapcap.rsi/equipped-HELMET.png | Bin 0 -> 688 bytes .../Clothing/JungleHats/flapcap.rsi/icon.png | Bin 0 -> 297 bytes .../Clothing/JungleHats/flapcap.rsi/meta.json | 18 +++ .../m10corpsmanhelmet.rsi/equipped-HELMET.png | Bin 0 -> 999 bytes .../JungleHats/m10corpsmanhelmet.rsi/icon.png | Bin 0 -> 363 bytes .../m10corpsmanhelmet.rsi/meta.json | 18 +++ .../m10helmet.rsi/equipped-HELMET.png | Bin 0 -> 891 bytes .../JungleHats/m10helmet.rsi/icon.png | Bin 0 -> 321 bytes .../JungleHats/m10helmet.rsi/meta.json | 18 +++ .../m11helmet.rsi/equipped-HELMET.png | Bin 0 -> 899 bytes .../JungleHats/m11helmet.rsi/icon.png | Bin 0 -> 331 bytes .../JungleHats/m11helmet.rsi/meta.json | 18 +++ .../m30pilothelmet.rsi/equipped-HELMET.png | Bin 0 -> 854 bytes .../JungleHats/m30pilothelmet.rsi/icon.png | Bin 0 -> 360 bytes .../JungleHats/m30pilothelmet.rsi/meta.json | 18 +++ .../m50tankerhelmet.rsi/equipped-HELMET.png | Bin 0 -> 927 bytes .../JungleHats/m50tankerhelmet.rsi/icon.png | Bin 0 -> 390 bytes .../JungleHats/m50tankerhelmet.rsi/meta.json | 18 +++ .../ussartemiscap.rsi/equipped-HELMET.png | Bin 0 -> 616 bytes .../_AU14/Clothing/ussartemiscap.rsi/icon.png | Bin 0 -> 247 bytes .../Clothing/ussartemiscap.rsi/meta.json | 18 +++ 56 files changed, 520 insertions(+) create mode 100644 Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml create mode 100644 Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/cap.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/cap.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/meta.json diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml new file mode 100644 index 00000000000..3941525bf55 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Head/Helmets/marine_helmets.yml @@ -0,0 +1,120 @@ +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM10CorpsmanHelmet + name: Desert M10 Corpsman Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. This one is painted with the red cross. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM10Helmet + name: Desert M10 Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m10helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m10helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM10MPHelmet + name: Desert M10 MP Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. This one is painted in the colors of the Military Police. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m10mphelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m10mphelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM11Helmet + name: Desert M11 Helmet + description: A slightly fancier helmet for USCM leadership. This one contains a small built-in camera and has cushioning to project your fragile brain. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m11helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m11helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM30Helmet + name: Desert M30 Helmet + description: The M30 tactical helmet has an left eyepiece filter used to filter flight data. It is issued to Pilots and DCCs. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m30pilothelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m30pilothelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14DesertM50Helmet #meant to have a built-in welding visor + name: Desert M50 Helmet + description: A lightweight M50 tanker helmet designed for use by vehicle crewmen in the USCM. It offers low weight protection, and allows agile movement inside the confines of an armored vehicle. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/m50tankerhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/m50tankerhelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM10CorpsmanHelmet + name: Jungle M10 Corpsman Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. This one is painted with the red cross. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM10Helmet + name: Jungle M10 Helmet + description: Standard Issue Helmet used by USCM. Provides modest protection from bullet and melee attacks at the head. It also has an inbuilt camera allowing for command staff to observe the squad's actions. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m10helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m10helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM11Helmet + name: Jungle M11 Helmet + description: A slightly fancier helmet for USCM leadership. This one contains a small built-in camera and has cushioning to project your fragile brain. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m11helmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m11helmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM30Helmet + name: Jungle M30 Helmet + description: The M30 tactical helmet has an left eyepiece filter used to filter flight data. It is issued to Pilots and DCCs. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m30pilothelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m30pilothelmet.rsi + +- type: entity + parent: RMCMarineHelmetBase + id: AU14JungleM50Helmet #meant to have a built-in welding visor + name: Jungle M50 Helmet + description: A lightweight M50 tanker helmet designed for use by vehicle crewmen in the USCM. It offers low weight protection, and allows agile movement inside the confines of an armored vehicle. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/m50tankerhelmet.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/m50tankerhelmet.rsi diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml new file mode 100644 index 00000000000..836a4af31f6 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Head/hats.yml @@ -0,0 +1,76 @@ +- type: entity + parent: ClothingHeadBase + id: AU14ArtemisCap + name: USS Artemis Cap + description: A black cap with the patch of the USS Artemis. + components: + - type: Sprite + sprite: _AU14/Clothing/ussartemiscap.rsi + - type: Clothing + sprite: _AU14/Clothing/ussartemiscap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14DesertPatrolCap + name: Desert Patrol Cap + description: A simple patrol cap. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/cap.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/cap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14DesertFlapCap + name: Desert Patrol Flap-Cap + description: A simple patrol cap with a sun flap. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/flapcap.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/flapcap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14DesertBoonieHat + name: Desert Boonie Hat + description: A brimmed hat to protect your face from the sun. + components: + - type: Sprite + sprite: _AU14/Clothing/DesertHats/booniehat.rsi + - type: Clothing + sprite: _AU14/Clothing/DesertHats/booniehat.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14JunglePatrolCap + name: Jungle Patrol Cap + description: A simple patrol cap. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/cap.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/cap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14JungleFlapCap + name: Jungle Patrol Flap-Cap + description: A simple patrol cap with a sun flap. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/flapcap.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/flapcap.rsi + +- type: entity + parent: ClothingHeadBase + id: AU14JungleBoonieHat + name: Jungle Boonie Hat + description: A brimmed hat to protect your face from the sun. + components: + - type: Sprite + sprite: _AU14/Clothing/JungleHats/booniehat.rsi + - type: Clothing + sprite: _AU14/Clothing/JungleHats/booniehat.rsi \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/booniehat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..f52d3b9ae0c66558756167ec8a3110f44a9d6b7a GIT binary patch literal 522 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn8 zPZ!6KiaBp*?e{+HAaZ;^YxqZTE+;2h>lGqL51u@EbN|(wu7w2}T`Qd3y;&STivMFw zk9*Pj<(6W3%(;iZ?F977r|g^VKPmg+UeyW0Di2;HBz)@KS`}AQlUQQ@PEpYCaW(gZ z2geU9UJIZ8dh46t;cSzgoZkGn$8_&r{f8i*Q^|F20YFE#C`(_1q)&?0- zhN2LL6M>9)IO-k__V>+#mKS?oRaQ6}RPLMAw5{b?^LB=vKQ>>Uyp!u~`XaeT*T0Nr z|9&2w`f;kj7Z#7&eIXCeT>ipg@|$^y%DZO|yeBY3cZsQV{@r``Rm`#WXaDAWSXaf;^61m9xXCp+dN)m`A3oUEc~9Y@&jPPQ znQk06YicG+Y_nf*Zsnc+yyNE!%v0t|gEX`Jlipsa#PV03uz!Hwo@1|L{rh;ew#gx2 Pvy)7&UUB#PbuX}Zhy>#hnI|p%B&a1A4snQD< zR2*jS_#7@Y%Z{GFOKlA5< zo&LAiI_bQ- zU&v`J@9_K0xlO8nuP);|e>8Qu$m6ydT|T+1FGL-<`k-#prZ;Jc{dUsvA7eRhem^&x z`NX@kY|DQ#ggNYV=l_zQ_xZ8hpGkZ3cbM^g`R(NpaylUZjBf@{S3j3^P6!{M%^M1QO_UvUcIC^YXZh4Y5+nV_&pV|I0 zVD1)hyMKbAoFChM#heBZnO{51dg zgk#@kCxp25uVoBe$Tp$i3WHFel*6GwW)F)j22OWgg@-E`Rb)&XS{B131-|i5WP5$~ zT*G27(}_}zhl@^5mT*kd*!YW~;iR%-l+K!pN8cQh)(bX#`xkdpc(r*{#-x?}4ZlyE zQ&Rmqd70n5$(K(#@Ng%+_c&c5E+t)XZ%^T^`z2f0pS;*nqxx#@f%jimGe6ikGa-lJ z`E&N-FD|{OwZHFlyLjk3@2x|>W-ag6cG;k@aoO>Sl~1_@x6EFB+Bw!i?Mq(n@0*!F zm5!ZCPBd6{W7FY=&z~Y{54iPkU9;18Z=w56<#KF7io^eu>d&7RH(Y*FBiX(()X1oT zH8N$&%hr>$oi)B_VBgQu&X%Q~lo FCIJ1#Kk5Jg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9f53fd29f49ecaba0f51a4ef1ce4aae1b2b18084 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0th` z#WAE}&f80dT!#!q*dB1KTNEn7;yicBWR{}~**`GJUE%)1AnUbsg|oXii=*I2mW$$R z1Y&3KfWRLdFXIN0F!6JOQvruon z`P7^u5hmUUU1!rrcGjny^shTHU;49P{rN5N=g&>wJ&*6rYCk4ki7&T#)EHLZ&XhdA zZTH{m`5`s(Tn|1kY?@Ly?d6uw32W3F|GvA%;K5&Sx1?Q5QLmM$#;p0b)4Vm87c;I; qTh+3|%$@mF)+?43yTOiWVBlY(>8Ix^Gix)@n+%?=elF{r5}E)6tZ-cb literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/flapcap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..16cc6aa1fb6f058f1ba588301fb00cb7ba43297d GIT binary patch literal 998 zcmVSP5S3dBo? zE?u-gp$NJJMi!kt?YTn);-N!eDMA^Puy_a;Wh1vmHrK>8+#kwL`<-p{b+ep#+jqB` z`GCy6@4U|Q%=dj}-ht<-A{#U{)w9NW&(`&Fa+MN^q>IW#DeWr@AdLIGjdZ-NndTRk zL>DWE2(aJP;pesm@F7GITlS>|@HTr`b!{yLj}VJP&B?=aAr7I=*+kC zbvb@Nl}eG5V0>X8gd+>Qh4{F?mi$IXni_D6$%-H)Kq|cv%GdHX;~fcC>~n%O@1DEF6w za3t!=M*_oy$KTEJdu2Nbj)o$xKj|+Om~5%OH2>5RZ~`L$X^s(qG{*=)nqveY%`pOy z<`@A;bBq9_IYt1|93uc}juF7_KUT6vprZ8w!hure=qqVkS%Bgk{ZQ~3dFtJ~@A2Re zY6jT#S1%k9;mL)|EPJh&Rz6MtR2u;7)F&tlfb^3!E0f7?(rR*z_r->#v(mQsm{{WV z2<`n>Y4Y_HJ%2N^)pzAwCxzxB%3~@CAi@ubgd}qE0HU<^^zoVjJXh+afH7ykF7tYX z$?*|Bc@c^51J`!y6O<#snwJ;9u?aza{ze?!0VZ5&nz(;&M-mk2G2{x1t4Cx}766mQ zpOtOJohgjiwy|@3ylvr=wN*h{02DunaD&n{n`tCM%T^k<8$$Tbwq};8s2fCCf U&1v@CivR!s07*qoM6N<$f>mbI?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c761fd527b883c145ad5e6d29f1a3b604b409e1a GIT binary patch literal 373 zcmV-*0gC>KP)RCt_YVHjXA>VQ!Pj5=V{0YlRP%JS0x(Z%jQe9A}{2Y@UW z5f*09QIUs>UAglRMExhn5hOVPW_fb38v~oL5(C?+jSRoS{29#k?=j3>yNfJGkQD_d zFWzKOy0H(!nKp;vo`y67xqxT~$ji$Eeb3ME;_XKu?;(S2RtCe~mQDuensSCsvu1$B zUCfOb{xGoofB5hr(V;-J10?0D~Pxo+b_erEX9z09ghKW^@2^6wPx1 z$a3T|00AB{ym|YURO3i<0MvK?58$wf<^>VCmQd9J)CQvt7cI;00000NkvXXu0mjfdA*V> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m10corpsmanhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..e58e49b1b748da8637544ae374f8ad6727e63149 GIT binary patch literal 904 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T>_ zr;B4q#hkaZ&gTm`iX4~k67y-e(zHZNWs;c-KX2#W7blyy%l%Qm_5Y}Sll{SN_IzI- zpDE3=Cdl*<^pySIt@f-JR%iCtm@~1++ro=}z zlxQigb61+Oe|MJj`RALa#O+O%eI2q=?uK8;BHqB&rp&^MlRde&|4mzLC)xftalilB z!`rs-2Qex9kT|;Hs^zk%&ly=4xMUP6V%~qP5>eUl-}T$>x$jG~clLNYg|TQdR{g#F z=)tLv-<~y>uByqsacoXs!{p0~il%#)JxVQjwYgT^qP_OV_lKA5dfgUjRL5&FTHT#I zw?=O>@8da5d2cimdXsB6uq;q0NShhV!gBtm;Jz}^Z{;cPHTSX|;Apz9JJosj(wqA$ zf2~kZa0)oU{$O5K&AG=~9^4H_b1hAT#Q#2v-kWD>yg=c=mQ&A#jKv+}THdZ)xr3wn z7JJMy4OW(W-z!dWl>GViHzWSJ>4DQqZ+0^{9*R6rEs(;vpL35*?E;kpduJQonw?iO z<@nzPL2Fyr_y}$9KDpT*>uz@l*0kZHm*2}Y0N z9)=~BZVZ=Xlo>Mn1RG3_b2!XO21{4`eXLZ?B6dsu0N;G`?q|EH-&c!>|+`wu@kuE^_}a*g48uej`<+wD7ZTK<{i3?q~voFgCE XE2+%UcBUJcwHQ2I{an^LB{Ts5c~Fzo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e9516d76ed5026b43f2b4bdc43f44ecba7f7738e GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|7 z)5S5QV$Rzs8@Ub{2(%cAg4_2s@vjt7kx*bXpAH2i1DFjV(>R`z0g9h1W|(c5i#vybll zDyG?DC9slV$ES0=4Hw^!A)bDRodoA4}U(i^)-f8|sL zZ=UI9%RSOWmL9or|J6>03on;NJEWOBTcQ&3ZhOO-`1=jZ1@s&zl0 zOK&u@_j{dh3|jceQK~g;O?!;i+NH}94zzS#Qron%V#A9a`L{gH7fzjFh46- z`*Uk~a?y?bwVI44uHNtOd-U{&g{Ud4#UoW7aVw2 zo>7X5j{5MBT>2nj$1UMISXwUz&?`^eM!?nMA zlJ}V33*P#VWeeX*TdB-Kvn5O+4$Qi@mQ-+Rultp>^2qCzv0~?$CJ0LXd2*$@;q%SU zb7q^bGZJzXy~18(spzzH-t_X@sUP$jl2dYjzKuV>@Y|wVCM|{SeQvuV^KH)9=03WZ zTvAe!P+KdjyuJPBlL_okK6RNn?pt?D_t{Gu*9&SMn|-Poc%vLrg@ta5)9k z)a8B7UaFV5^-;7zNA|R%w?iGT&y$xqQhfW_PX^815t*;Ev%jZCdoc(uo?qO0^5kEQ zwEFL1LdNIHxfZYXm@c@|()jFgf%m&R+WmtUq$@I*5+AdG6g@ZG; z*1eshD!=3lQ*PPkbLmxOE0Yf2WncP}k?CRD?YS%ZPES1@z;<)RUc0l~cKdrxXHd20 zC|6$EY|j;O;uf!W?`>|yKTlU2-PYHBXJ&Sfkma73!a?bG zMwf_L`zC+l?z2`q-)O3(v`7ASt%CoSpU8fSHrQ)78&qol`;+0Lx0d#sB~S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m10mphelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f29ef2d8f8fa6348eb12f32ecdabc040d739ccb7 GIT binary patch literal 408 zcmV;J0cZY+P)>WMZ_q2a zaoGbD+WtTG=K)s z02<&p0dlzuZW)VY9ZWL_!_Sj{0U-11qJf*sLh`NuF~r*dJPm{r0GT%$k8m6ZzVE}f z?IgOci)!^j8A7=O-C7N;dL3u;ImY=syvYPl+3a$iM$!Pq!a28015FmdGEKZ@fcDoI z5E0)qJWmQbytCXV0A!Dq2Z+tdgf87* zc@@b6h*6`%DFSR2Bhg51=Jx;)-R@}qsm+$Ty@REC50s`LHeY`OV)a)LVF)ED0nqIh zRdV{@+ls0m?e`%fQHxcp+$q4Wr2#a62G9Tp2lxRpn~mqPWPU~f0000STYl~T;r_+{#nEQ- zZu6xp1gZp_RojmVBn5k!UHX$zc&7aF^t|g^=0=vAzdFNyC@pTZRLHT0$%e=aefzHI&O>N~231Q@?{cURsvW0v;{`Ir(P z)!<{Lxh&aG>rUK;Uhz+sr*!T}#bk%9dvnWg%KEFWTW@jrwB(p6-}xr}_0|gcZ@=&A znSP79Waq)zaPYXMpYQ92RlT)ZZ$moFwx9dM7I^VxiH66Anj7f~HVr>A@}uovxMlJA zI)$-lGFshT{Po_{=B@4D#aI4W>nGDRqxIsO`CF=akDh*TpqM8Z9(ZOZ{!>%$*V*q;xet8$n;1^7n&97e zm!(oti7CW9(f@hFX_=)B2Y$}-E%eE;pZGpLtG$uZ$TzJ1Nc+fLS;`?Nxp>My+)msk^@KdU~AlciCx!Q?oH z!>nW$g|miC6P`&hdKC9CEU|QBxFn;@kl6>8e(<$_@*2Sz8MO@757PVUCT*L_TJZcu z{JQ)ABf;&z-@M6fFlEZA{(7?cein0s`0Z0n3V)xRIrZh&@hh8dmBp_V^$EL?IotU1 z`T2H>uD{>rUc0(~dYfdn>lBs;ADHJ%crvT;=E|3WH_se9T;8qGfapL?t)FYxGhtSJB5p>v8U;rP+xCs#f?sN1-(ck}t< zIh*~@t>(JKv_?mqwOxA3Jj-`Vf>KeLcPt`)ERBi!vdA#~>8u?qCLHdpX*}Xt@sMk2 z{<(7(?za?w3!T=qg<;OLW98P?);sL9pSeazKKxwpQz3-k)vLPU_rb|>dv3P}@HzdL gMhO_4;dV}6@TQXW%!ay1U>;-eboFyt=akR{093=FLI3~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ed29b61c21a460588fdd02bc20e4de2adfde7548 GIT binary patch literal 361 zcmV-v0ha!WP)4+m%ULKnM!*Od0VA-V0u6B*rPqe^ zRrwbIh9B2zxVsYTwU+^LiLyv&2_*3GM_)eMIlH*dB%wV4246N?5GOWn>*siV{{($c zFbcY;9vtbuPF+9<5r6$5#`CF!jRL?+?P)uYSip*iNO=m%0(K0agfl$3E}Vy(KYhRV zhK~O%_Ypxk$^r~`oqGvc9lD);ohS=f@o*W;m0?_y#AE-}FGOH ze*wd{?|@B63g|{lAen-<1624$logVzK;AI|M!*Odfzkz*@)LFZ-l%p!00000NkvXX Hu0mjf2Re~? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertHats/m11helmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/DesertHats/m30pilothelmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..0d86946a93392549daa557588694432d322f1b02 GIT binary patch literal 875 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?H zr;B4q#hkZM8?&Sx1!|AI)ZO4IJb{b#kqTY zriNr)m5>Rt5D*pGVW@6V+YtEfZl+YP74x0%zQH(K21+h_i}EG>N3%<2M%?Vl4i zZr>e!=lEvHW0OzonzUH`T+6EPGx3UZ$%hpZ(sTbmOTE~_Vf6DjzxB}@>;F7DlCOH; zoS(I7e(L1?_cO&G3(oyv>^LV!|Jmo2=7KH%zn)G{{dZF2?|S<=Kh`QYJapT1iL2n# zON$M?yW37N1^o4YANTO>amOn2!v?cIaIO3maci#&JTJb&XE%MNxy)SMpJ5O7W^R92ZpG@BZomDKe`e2Y z;dcsJ+y?~qdznke#lG3jI{$RQ^REW4ruZp7GVx{Hc>91B>x}=u?}kY+Ugotvp80(y z)0z5bKdYn)nCLS!t4HA z`^%_id9Z0kKcW<4IYn#pFLSWtyl2S%;l}iZ!LHt zdpnuK>R{A@mkkyVS7#`Fb*$siW7v6fy28o>yA&_1lVJ@L{P6EAr(MmzNq_(TIePhw zqE*5>&Lb5?obm!6J8hm%UX-7><4d>QGhdmj0jCXrtgmB~f5E?RYS`4k%G>EtoC;sd zr>$5j{$N>ArSJri1^PXFne#U~rZUb5ezSj~o$NEI(^o!5tq+*2U|yRLb?VRs^Zexp zc5xI=O5t0uP|i{KlKzbR19_9x*L-IX`og|?!t@W*>lp7l&9Hfvmi;TG`Bojbi6~>~ j=NJ8oxI+&fwvY8wGCoH3{N~>S%smXAu6{1-oD!MNAV-&z_gBC>FaX|t28%fW-u)?c|xioRKYv7S=Lys%hZ{BB91 zFZ)4(3~paVMsY)d>3KzazZDiYtiw21$Z>i51q_x~zdHrw+t8!&*72kVKHu027g zPCYNTZ#$}F^HbCzXiwC(#;f@UX4b3`IB;2E3xn$IN88u38$Dt~4qkTVp0}I% zT~F-O&;Ygv^BxyHFSgwI-}3@jhuG&C!VFihuVT(Pwpa0NNy~KOds3Ihf1aIsQ<{Oh zn#)6`T;RZ~lF!eMip1?-yVmBbd(oYLjGRjPe96LhOj*SKTdi;W|4in=A}XgtTUa#weY;%q!zAksLKmHE@4vGAx?QlJ%$4;nt84RoSZ+Lj zaP!~K^YTwxKg-^~zHPm#!}99sQulAavhImHae%SuxWzNyq(gN{j1#J~*T-GB-EW$8 zBDqYZ=-l_rl%D%iL#w)V-Z-%edWx8|cmaJ8Jd3yX2V`c3PmlZB3 zoc;LRy;$OP$?xZrCr2~{t`u(%zQ}STQR}JXP7Z$kCh><#Jipg|>zwIoP_xdZbe7B8 zDQ!Ioe>~Xoi^L!3I4tleZ)-K*#la*xC#GlB<>$;wD<0^p_pbZ&!Jl7Ovax!P1&AsOmyq8P)#5sn! zV8lOAN9uZQI81mv4aq;|_m@t%prae=RAfKXB>v^T0@-pCz?j+c<79Dcs$&!ROqX z^{@GK+^CBd@G~&y%MGyAN$npIw2(Z7lZ`m}4n(v7c=L))c`mR6y^X%I^EB;)Q z$nB>e%v!-_YFDH5F1X`&L-JjBM{kBH3mC)|1r1mZHnFHbkZ3U8E0^kJST7oDU-OK; z=D|C`Z-$yH#T+e|lM6Wb?p!gRAQ}-Kc7IPlKle9AyQPX78MIG(Grj!w>u%VMu1D?% zFWW0^(cR(9QeK~&D=De;2d8HEV@MoEQ0Ui(}EZ5;r*~MLZj90>0-CeB`RVK zr!W2Bb9Pks=v#I9?nGYU#|kgJPYC|ylUkzCl(#Y_oA&|t_vy<5)#6t?nQAb9_T7yf z2ft-4-yoi|GjsbrpE~Xy?E>L%cls6agf%=W&dI-TS8(DnEi41(R0dC1KbLh*2~7YP C0lJF- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertHats/m50tankerhelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1c29e99088b706d2da2d150f7ae998af94138758 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq~K8 z)5S5QV$R#E_SuIVL>NAV-&z_gBC>FaX|t28%fW-u)?c|xioRKYv7S=Lys%hZ{BB91 zFZ)4(3~paVMsY)d>3KzazZDiYtiw21$Z>i51q_x~zdHrw+t8!&*72kVKHu027g zPCYNTZ#$}F^HbCzXiwC(#;f@UX4b3`IB;2E3xn$IN88u38$Dt~4qkTVp0}I% zT~F-O&;Ygv^BxyHFSgwI-}3@jhuG&C!VFihuVT(Pwpa0NNy~KOds3Ihf1aIsQ<{Oh zn#)6`T;RZ~lF!eMip1?-yVmBbd(oYLjGRjPe96LhOj*SKTdi;W|4i*SF_B?{GNXb!lS3a%1B!&E>VnBz=A3=`>BuRL8yigarx`oiJ8>&UG|c_; z^ytr1E#H!*)Ri~r$v=1A0y|B}xB`nWg3 z=UA2HySKYfF$>*ftD6{Vzb{MO`0omgUItHBKbLh*2~7avE#W2r literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/booniehat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..65dbcab9514e009917ac366ef166524c8fa47406 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eYf z#WAE}PI96|g2AhXK=vN1ge#2Bml;28n)Lsu%TL22{_}Sq^eAR;(E0v-Yr25Y6Ia3d z@BfTDe)+FbKEc(f-Y?%Yr|DRFLdDl#$|ut%K5aPefB*1JqfMW9s;aCK%sTd!ygXGu z!DgeP;}&M0UXy>Py|@qQvbr*A+;H4yU-!tiD=NsTDT7@>nv0up#*M?r&wKjSs8}l|!j|xjUnrth+C|vcfUm^bW3IB=!ouw55{?{~` znp}S|Kia3s>8sotyY2PyGt8-zIZGy`FMpYsCV8k(s9?kX*=LUJ+WT9Tm}D6@0Mx9a^|xP z|Jgv@{*QM|_it_J{Tgb*FCDRZ&6AB;CVoqK)R*oEn6Y2#D%VfV=GhM>-H&3ZPk+`t zzv<`MyyG;ad zA9Lso`vtq*n{zzQK)TiCpZCm**b_-HEJWK7q$VYuvYKk3BYs=tCVRtjbt z6&*J*A9499>7dAP$f;?MM$vS=*v8HN^OeupOp;~z^z@^!xP(V<_A1K<4{t$Zfyp6zzb_tkyp{5rx=BKc94iE%w*G`HnpEOntvPOACBk<~f&f?)SgDw=w^6 zGT!u`<*`v!3U3FuX+z6mwh0AS7=-$y91aCCdst*KaJusCQ%S4x0(M&N8-U->`QaEADx-9i>rs{g&v7?r)67~X@1%F|CZYCV!;Lm76k^zHH_UiT|PFZ&&l1E_*k7GLr#ZP`0~a=J$-Z0 zqwXS1ybDD89*y;9{}!s=$o6GdE}L+})sIofHk;V) z`5qYawpOFz{BN$Hw%snv=XOt=$MS7=G_!*3pPv)tR<-O9;reis=bdroR=<9>J+oE{ sJ-Q{syJGc9;RWxM7#KMm7?^Ar4!rey)8hWc1?Wu%Pgg&ebxsLQ00wSyn*aa+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json new file mode 100644 index 00000000000..dd917cd0b9c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/flapcap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..0c020009c94816832e5c6a032216204edeeaf9d5 GIT binary patch literal 999 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|WC+ zPZ!6KiaBp*+4}?siX7XorR2(`q|2*hwn$}3=cyH|`Se`agxSR<6G{sU3Kb8!2*=9I zk(eXnLetb2c_YT>>Q&-Xpwy|(Ioe&wF()3(p+ z-tQ@nFY;rJ5#YJDDIq!Iv7O~?2cwza7P?eq-rvY@=*PibSuIk3JkF%94SdI=-O7>j z-zB=`w%7#y1531jUt(%;E?u)}71vpJshuCa=iXgWW7G2IY95bW?TNV`ey88O5)w0$ zLsvIZ?Txu9s{o(5qTKwSrqU0;ecmbasB_8|{vf6c&zLzBX3jhAw5qM&*Iq)yC+hl< z#?b5<$(uQ1S_{9P>`O>fJG@?`)nuNh{vyK&e`lXC7EQ)YJFhlQwf$`S_F|Y%{p_d7 zXRoh&T=`#i&i+bf?(gptH8*o``EFmhLt5!e>))h|&nff&NXyPV@XJbiLTtEKLrL1s z?Y32W+IzYMmTYi$pAmmMN_x%mfU|QK|4HCv5X})!-BKwiEBgD}q`z@DO_vrkNG?3P zzwT?|?d8?a-gs`iD*TD-Q{#qig?C5y2rpq>@FeVgbh`E5w8~$*pPu0gaabQ(ZL%d* zXi1F1r-sWaZ(dm^n7c3JuzEk;sBT`z&yT-13gjxW@9;b{k9&cTAnPOPmPHP8SXyQ) z-7_rx>l?Uw z7%s>tGngFbU^r{Y2dOgIWL$+(i#%u`3`UYRj1t)RM}J1u(#Sp z>^Rehp6qPK8zC{i$w!v){{A(2&4bI!^8F@?HO!KC*)j3b)b32JmT7BD^R!z&EbnWJ z*tcxkj^f_8S55@>Y++E^^TNwZe%-zP{hfy{>(@wIREjQP6-dp@>sht=+Sb*Jr%qj^ zv`5xVUScobsYwfJ9~R}`d*|$F*YeLCTNq-5@N;!TQ3kH58eRUtoXg

gTe~DWM4f Dg!{iL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..97cc8c74c89e3a0c5d1f2426a3292b8c46f4ba2b GIT binary patch literal 363 zcmV-x0hIoUP)VQ!Pj5=V{0YlRPA|ibM(Z$}p`NT*U2Y@UW z5ffz);OByiefandMExhn5hOVPX1S`8Fhj6U0t4HsjSRoS{2A76SpZW)vLncfg4b`q zGd!I(2f_i;uepCSkPC=*fUKII9dsLC^N za=!Zi`0-1kLxE@qz$}-R5n~V)=7a>hfjF23Mak>8Tnta2yaKCZV0cNavBWz7W;w`` z43_epvH70&2s_BV&pOa z-2tQmk{kf_-TybQ@XFK90pwajRR>TTj5=V{0izBWb-;i-008jVdU@O)f#CoE002ov JPDHLkV1l!ClV<<` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json new file mode 100644 index 00000000000..3b87efe09f8 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleHats/m10corpsmanhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from CM-SS13 PvE at https://github.com/cmss13-devs/cmss13-pve/tree/master/icons/obj/items/clothing", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/equipped-HELMET.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..e68a54d80fb7029207dcf13281e61e4042ae1204 GIT binary patch literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?J zr;B4q#hkaZ-unqViX8P9ohanx`dfX0hfA-A$j=r254{gWe-!v6^6Mb~SAPyh6-Skb zD5l&-rdfTq!TGyy2F!>pk1l;SeZr;48^zDx%$@1`PS%0LXlCHllc~4wpRQJ&a{4Mu zmCKZ0jl2RMqhBVbyjKalwcgyl)L@mkTEPE{k2Tlo8i*xmPuaJT@n=pHFCXv2cYEiE z$;Ee z+wzeoyPKp8V2O;oi0=qrK}VGG4uP^3j<$hgrM4xqfNB z<$wKPhrJ1}gG|Y3Bfq#!$q$Z|zS5s{?{WqI0uJ^6@7^w7=l}ib>gTT(sf&pAH2(0N z@V>~F;}}~(v9!0zmDKv;O`rElo{@aia5^i^Z1t|(L!0jaf3`cgU)eDhSP;?2a2$99d6XWN$+=v z|IMt@pppIM?-jnBhW&2)|2(t3v{S{keVM z%5AHR{pa~5B-`$jW4!q633schh+WRs^=J3b;94qsg2B^XiPiJklg=%t|HRFnsLvYt z{mO)s-fFKlKKpL)m$T9Mz-;>8d5>%F%oy*eT$lFWSLkHSm09Ff?(>FVdQ I&MBb@0EG~n3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m10helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4939b01d4264de5880778932f8e82289068b5859 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQga z#WAE}&f6*Z+)V}o$Mj#E_0cZS3KDXu`_G@M_>cMQsp;Lu>I)TSX9&HiEWUI1#^>8- zceb@IWe{m#3Sjup>F{z|X?A8+{9hJ^vnz8C)-B((9T*&_|RfQ)YG<2_}+q_~yr>egv89%&UCL%HG z;SBr5@0`#5Dw-wC!7JxGElU|LHG0=%ZlK zHleKLY$5pw~*4A-+ zu}Z$bH?j&mc5bc|$$J*~|JE0G=JXJAmj!=2e?L92%^|)aOX>G5rYT&`uTC9c$h)t} zcFf&fc8b^H6<4=y*m{*?&WY#Sul}miH5NQ}%xl%;zY~fQ{{Q$Ouyxn!x6RWS=Imi+ zx4tJAbKdc3^4BY-JzZ&=J9QrZja{GGd`Q?$@woIoyDsI!GC{kPGB_{T*i@F4WacM+ zI%r{LzD-f_MCbzH5{F}x+a9@kytwQq;#YS+yW!v3ebJ9Eu;2Zi#reRLZ=Rp8zs?1V z@J7LapB2BX=B2CrU{c_=xab#n?4)qCyZa1Ip{r#|_ z8l@d^f>Zr>AB?zuk3~HET2XzGovy{rE%QwNUlBXOq|Lx{oQvV`My3M=YZweEHWC@I_{QgT;ij-hI=zC36d`y{K3GGQCH9JCEL+MmPUNrSvDb;o%Tq8;IeNQ$flhzmkBsjf zdK+02j;+03C!ei3@2(g}uFL!Q(1rfG_a80NJ#gobvg$*(rN5>1xEID|_r7l7urJ=e zz;DjNZ|6))52J2%7fn{Q|4k_4YGm!|$%* znD2Uo{pi~XkwQK9c3hv_|Lek3@rD0+u>}!E0RCjuI`eDAgZt6jfw_vo)78&qol`;+ E0Bt0gdH?_b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m11helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2349d7f2b432fc17ff097f6752c59837abcd3e03 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQaY z#WAE}&f6>Zxta__*ggoCY(B*`r)vt!#P|OtzH&I;ZE4M5n>uy+X=Pm(ZL^IkHy9=J zlJDn#_Lr8@V+~+n4QTk!5^yX1=spdr?R88C3bLdOWJ>1M9>2^h9mcB2`rzTa5cb>G z4s6QdV3Mz~e-^w%aH`zFnvFV-gCeF1v03yT-4(^Z?jvj3I~Ja~Da#vn-=N>Cop8vnX8xH=gcMw#F4r)05E<&VE=D*y6ERVGfySy1i92i9w b6dsUucPic_Q*4$D3Artv5iOB^aQ zKG4#={#^C0uh(|ZEO@(ad%|z;6Bo_ye13m;zwVmoS0$-Ch9dGqUqH{NxW zl^sfyXnO2$+)Hf5ubW?<>np$b+WVzgI$&jp%d7u3D-){tIUfIuGvbR`lo3*!Hizr> zs~vs&t_e-Z+`qlr;HiPRdTHbxu_EaMBFit=%<4JMb>F-B=b1Exhe8t`TRkyL*t2d? z`RdX)ESEKp{qt9^ydWV{JHm^$g`Bk z`e(W?rgU3o_VE0e|AFm5;U2~UnS2JBa@-5#MQ?vGTxIFf3lX2VR$QZbiQ2=mZi5UO@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m30pilothelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2b94997beba18b725195d50c8d7717646a750a2e GIT binary patch literal 360 zcmV-u0hj)XP)26!2&SNgtu~-=kvxxZo7-SdEu;9dlm${0x0)*f>nz<^OF}3 zBHsX5eWPBXZf_((?j?kvYo1jF-vF9+DLY2AA(hl+4i$iId7{1FY56U{N}*R32qNDA zFqqHnx9=d&1!1)S{cjdc>aUMadBi(z{%bA3H;yx4y0NL2HmE(A$c@&jmc2O4xn}`u z4`6cZa_hkK7Kiz8w*1XW2*J#~=o1R(&qx6%00p1`KB+US$9Wa@{7hT`0000J$gN`QqEB z5C}49tt<7!? zm$2X#77Y=uMG;Yxj&&cc-V#^mFkfo^%Bxx4>P=}1R&)DI1rz2s``=1Gbh&9;tu7;5 zGh^-lZ`OA14;T(Uwt9E_NLy_x$QeVS|FFkVhw-+ovtbeG)_8jx( z`r3!HwisthKi|=}RFb7Ca)k~<5PzmPtH4>+4sE%JriYO`l6 zupP6yqd9qn*^4=XG57nMw*M4)pyRNBLqd`>qGI)Ig$V~e1+9{mPCPi=boBvay5pz7 z6aGw-Z?fOgchWf&_A>mB**5uSYuL{x@LRon`ZTVYS2E^_@0Ay!5(mqUt^1T34Kl~M9r_-#DjfgFG~satA8 zEk~NuV6~gPW$IFctjpWBF-&gdJfNx-lI4^2WmQ4F!_rSLV)73N{8i)3Wt@=5A(vVt zvtZNRW#Z@O_x*d!@Y2J~A$CG@{oiM?IrT3NOKqKHzxDVPp@ww%ww)fD*(J*EJA#_c zW^K8hYM{2tas8^@S8nC_e`S2W%iGbLVafsqamAhC4AMe#9GF=>&iO>KI12RJM}1DV zEBMawdqvkpHIDQI9=?N(mA1^8il+y5fk0Sb5T?YEt@R^tY@ zMa3=^w{5KD9SPqqE)!1exN-aMiYL><+BqCP7_{v7uCFe+=^-yREqVTqKqt{u#vMAn z=jSjgKFwHuXZ|gNiL8hBwZwdRsWVUFZqUwaatD~zy)Q>hjb1uCXa@h;IyI*ad$X9o w>3uul`*gcQSmW&t&+B<6q6R4T@cze`H^th@RCKlwFvl@?y85}Sb4q9e0OmcF{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleHats/m50tankerhelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..62a551f75790c096bbed608ce90180dcfdabbfa0 GIT binary patch literal 390 zcmV;10eSw3P)q;4*+iUaw*)h47o(Ovn0;9CT`Gx^bj9{jsN>VPovMv-4-lpQtQ;QL#UE>kNI?XAztyo)$ekeyhUf zUZe7)H~BgZv!iUzrCy%zWdl-cv@l-N)3VhCNMTtcthD8jo-xz=?c1vUy|j8OFndbJMuu5ucY8F=c=RRyfxRMr??HUtzPCYj Y=c5<1w3Cin0Fw@br>mdKI;Vst0ISCf-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/icon.png b/Resources/Textures/_AU14/Clothing/ussartemiscap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..55ad1d495dff513ada49f9943c12c9aef9e2279e GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ezo z#WAE}PI96|g2AhXK=vN1ge#1T`6PDnO%Ry=M_*5`QK{_XrAoJ577Qsnr)^Vf-nPxC z>&NNo`v3M<{G6lWKH&{Rt?l9ehm@Ll^6&3Sw~)QX#D7c9Td#3w5-{l)}^n~XVY-ta6CV0c*j``bjB=OWe&PmC4P7Klmg qx>*2rMd^VR%x Date: Thu, 27 Mar 2025 18:08:09 -0700 Subject: [PATCH 03/21] Merge pull request #43 from troytroy400/pvearmor PvE Marine Armor --- .../Entities/Clothing/Armor/marinearmor.yml | 111 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 917 bytes .../DesertArmor/uscmarmorone.rsi/icon.png | Bin 0 -> 353 bytes .../DesertArmor/uscmarmorone.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 933 bytes .../uscmarmorsmartgunner.rsi/icon.png | Bin 0 -> 398 bytes .../uscmarmorsmartgunner.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 881 bytes .../DesertArmor/uscmarmorthree.rsi/icon.png | Bin 0 -> 881 bytes .../DesertArmor/uscmarmorthree.rsi/meta.json | 19 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 985 bytes .../DesertArmor/uscmarmortwo.rsi/icon.png | Bin 0 -> 397 bytes .../DesertArmor/uscmarmortwo.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 922 bytes .../JungleArmor/uscmarmorone.rsi/icon.png | Bin 0 -> 355 bytes .../JungleArmor/uscmarmorone.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 963 bytes .../uscmarmorsmartgunner.rsi/icon.png | Bin 0 -> 389 bytes .../uscmarmorsmartgunner.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 891 bytes .../JungleArmor/uscmarmorthree.rsi/icon.png | Bin 0 -> 351 bytes .../JungleArmor/uscmarmorthree.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 972 bytes .../JungleArmor/uscmarmortwo.rsi/icon.png | Bin 0 -> 384 bytes .../JungleArmor/uscmarmortwo.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 679 bytes .../Clothing/ballisticarmor.rsi/icon.png | Bin 0 -> 292 bytes .../Clothing/ballisticarmor.rsi/meta.json | 18 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 886 bytes .../_AU14/Clothing/pilotflakvest.rsi/icon.png | Bin 0 -> 413 bytes .../Clothing/pilotflakvest.rsi/meta.json | 18 +++ .../uacgarmor.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 931 bytes .../_AU14/Clothing/uacgarmor.rsi/icon.png | Bin 0 -> 357 bytes .../_AU14/Clothing/uacgarmor.rsi/meta.json | 18 +++ 34 files changed, 310 insertions(+) create mode 100644 Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/uacgarmor.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/uacgarmor.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml new file mode 100644 index 00000000000..703d382e751 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml @@ -0,0 +1,111 @@ +- type: entity + parent: RMCBaseMarineArmorLight + id: AU14BaseArmor + name: Example + description: Standard Issue Armor used by many UA military organizations. Provides modest protection from bullet and melee attacks. It also has a shoulder-mounted directional flashlight for night time combat. + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/Armor/m3/standard/padded/jungle.rsi + - type: CMArmor + armor: 20 + bio: 20 + explosionArmor: 15 + - type: RMCArmorSpeedTier + speedTier: medium + - type: ClothingSpeedModifier + walkModifier: 0.666 + sprintModifier: 0.666 + - type: ExplosionResistance + damageCoefficient: 0 + worn: false + +- type: entity + parent: RMCBaseArmor + id: AU14BaseArmorLight + name: Example + description: Example + components: + - type: Sprite + sprite: _RMC14/Objects/Clothing/OuterClothing/Armor/m3/standard/padded/jungle.rsi + - type: ClothingSpeedModifier + walkModifier: 0.725 + sprintModifier: 0.725 + - type: CMArmor + armor: 15 # TODO RMC14 20 bullet + bio: 20 + explosionArmor: 10 + - type: CMHardArmor + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3JungleOne + name: M3 pattern jungle smooth USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/JungleArmor/uscmarmorone.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3JungleTwo + name: M3 pattern jungle ribbed USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/JungleArmor/uscmarmortwo.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3JungleThree + name: M3 pattern jungle dimpled USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/JungleArmor/uscmarmorthree.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3DesertOne + name: M3 pattern desert smooth USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/DesertArmor/uscmarmorone.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3DesertTwo + name: M3 pattern desert ribbed USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/DesertArmor/uscmarmortwo.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3DesertThree + name: M3 pattern desert dimpled USCM armor + components: + - type: Sprite + sprite: _AU14/Clothing/DesertArmor/uscmarmorthree.rsi + +- type: entity + parent: AU14BaseArmor + id: AU14ArmorM3UACG + name: M3 pattern colonial guard armor + components: + - type: Sprite + sprite: _AU14/Clothing/uacgarmor.rsi + +- type: entity + parent: AU14BaseArmorLight + id: AU14ArmorBallisticVest + description: A light ballistic vest. + name: ballistic vest + components: + - type: Sprite + sprite: _AU14/Clothing/ballisticarmor.rsi + +- type: entity + parent: AU14BaseArmorLight + id: AU14ArmorPilotFlakJacket + name: aircrew flak jacket + description: A light flak jacket designed for USCM aircrew. Provides very little protection. + components: + - type: Sprite + sprite: _AU14/Clothing/pilotflakvest.rsi \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6bdad742a1010b44c10d25f20a3412a823585023 GIT binary patch literal 917 zcmV;G18V$eYi+PwLSggo>UjB0}iNqU6vBQcQ(JFr^~v`!-Ho*TlYg=|t-656U+C+V|~z zyKl3+nS*4UWB?f_89>HK29R-*0c4zHfaH&BwTdg3%hYOZmf~ym`mF2qdem-rOQZzr zgK!McMq5N*WWY?NN|(-_qUW#Qy7gvjAha-FcR%|v0MY`%FI_n8bvS5nXlmMzYk74o z`y|sB8Bm{{$%38pLbq;Q9Si`U(f@wq6J^Gb76_E}7mgpJ6LUxVnjb#;ei$P~WI*Fx z)3;b^eYfe?=NE4V*R|N{cIe*2r(SRA;u+tEz#I1;(Vgt42qFU(PtN-w(ZYQOv%vi; z?FMPm>3;F;dUM0;VjR$IZEkskq=*cF2%bZT!ub#^LtNM7K&eF4%3*K9<7cn@o&@93 zB6zgYJxIIHK29R-*0c4zH02wD4K*mW1ka3a$WSnFG87CP) z#z_W9{{gSX(c(2UvO!^*{9l07JYLK5TWZz%0KAju6c}=H$kk`!zR%|hl=A}dIG~BT z0OScdYm`lllZ+#`0hoE@L@|*~a9B-_W{m*u&8zKiH9?ZI zfXIM2xPGeq&w2q(Sck_F2P>TbkpaWLaz@n)XaJ2+XV^?j$00Ic)Y6(%y+9rv)uZtL rNHTzolMEo^Bm>Ae$pA8rc>{g`ZyW_vOE$F800000NkvXXu0mjfymF_F literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorone.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0814ea586a98d0566f5b79779b69be3c20356ba9 GIT binary patch literal 353 zcmV-n0iOPeP)ag<(jZ7ic6PA%I$?O8s7kri%^R9-PFe-LTjz4*-!X#Q-d`7Ma;Jp08;%9I!Z# z82SD2LJ^oefYt86PqZ4Qv3NXNCUt25-ByE};B4CUB#)QJ`H8oZ2jI9qVF+Q4mZ!Bn zoq1hU!ZQF9yf`hyqX1vK^Q$s;(IBSJw{0RHyDA7JtP5Kn9jC(*^|6g1`5o7rC_xANuPdO?v-n!4nqd4i|t+U!6Exy@L zQ+Sunbe^5R;iUTd2;Mu>98?(2)z8_fHp7MQ!QbU`nP=30b-G-Tbm&=%#rBM_M9I3F zh7z@J3?hx#6FzaQinZmqY&YqjXvL?Km)X>rK5t(kysD0)v1clqWdH42-;}*CH~o2( zY_N9jwd)RY?vZu>j|*7x=`#?<8yRB6A5_&$i%*bB@Mk*CwBld1OpAug0;86C|MZ`% zTMiZ$6i#`~q%rM)xk9C4E9-&T?tv^@?bq#hWop?LpOF1~>MDUVhv&6y)LgvjcJ9pI zEBxJ7FDz(GStN5{U&E4k2B*xc93OI?c^3IIMdlX7%t%@Clhq{GXwTCI9e<`Io8a{e zBVV|Rh&7zPXqL0TVVOU}`EA*g%mg04__5=IF*kRE3cGPgkFck| z=RnIEuBa+~W52QCFVn2lqS@+ag(rw5%N_aG@WgWdbMXsKa_KYk1q%6QTyr_?a98<@ i{UL6LzQaiPvH6^avU~4Nd^irwcMP7celF{r5}E+6fTEuO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3d96d2401454fc5a8088e90f218f1cc837150c38 GIT binary patch literal 398 zcmV;90df9`P)% zk-kEqYZqy$n}`%LHYgdq1rd`$myFkZm*x_J%aLBBaK9zob0OdF{JH0X&MXUH0W5$8 z_+J3Enkya0At5%E@}1|^WtyfG$NLH~!~&?gmvq;;q0jlZ3?re9TD~WL;{f3Nk_X_` ztC`ugGI|{LWgf>F@#Shu8JIbMU=gWrvfnAwTsXf?zVy8@0Q6V5iF_J8WSOpX9N9m= zjM@EX13<_Y<|ubLeu`KC_uaNcnO{Fpmgi%p{L zxncp}{bLs>n8FOe94# sVu{P;KBfF@028tR7Qg~nfU^S}0EkteI=#@1IRF3v07*qoM6N<$f{_cUJpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json new file mode 100644 index 00000000000..debc40baaf7 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorsmartgunner.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f50b6af8de8a038e808f63cc4dffffbae4b5db8a GIT binary patch literal 881 zcmV-%1CIQOP)`G2oOM}t+nqJD2j_jDyzJYs^X9v= zlh>U&PR0oWka2IUXx={M6KpYFT&#&Z+%XH@EGAdMrjTb z=YS$7k%(|!GY9-~j=l{i4&J?aC7DMg@cN|oEA0bdQ2TD@!J!UEr-euWggFuresa>_ z5kM&Z_<2B@u>CCj{8zCr%K`D`1Dg^20wCnm3*+;o2(FLce>j^>ctsnuqYys=*lD%f zl@EiMc}@KOix0@Rq0z-mk|}NY$W_s z4#?{lz}?Y`1YDc#OsgkBTpmx8*DtWX@r<-U*srbL@t=!&60pWottLK}ih|Mt;9_{b z(sOzJ0-6O66xH;mmo&?EWKqNrcSW&-#CL94pJqgkrBoZL6JEN#yKm*uF+sV7r z(shUgC1wTBk}AYqqeqm00000NkvXX Hu0mjf(Vmc^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/icon.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f50b6af8de8a038e808f63cc4dffffbae4b5db8a GIT binary patch literal 881 zcmV-%1CIQOP)`G2oOM}t+nqJD2j_jDyzJYs^X9v= zlh>U&PR0oWka2IUXx={M6KpYFT&#&Z+%XH@EGAdMrjTb z=YS$7k%(|!GY9-~j=l{i4&J?aC7DMg@cN|oEA0bdQ2TD@!J!UEr-euWggFuresa>_ z5kM&Z_<2B@u>CCj{8zCr%K`D`1Dg^20wCnm3*+;o2(FLce>j^>ctsnuqYys=*lD%f zl@EiMc}@KOix0@Rq0z-mk|}NY$W_s z4#?{lz}?Y`1YDc#OsgkBTpmx8*DtWX@r<-U*srbL@t=!&60pWottLK}ih|Mt;9_{b z(sOzJ0-6O66xH;mmo&?EWKqNrcSW&-#CL94pJqgkrBoZL6JEN#yKm*uF+sV7r z(shUgC1wTBk}AYqqeqm00000NkvXX Hu0mjf(Vmc^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json new file mode 100644 index 00000000000..0727207fe55 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmorthree.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..beae9603797fb03f39037f2aea62ca8ae6b09198 GIT binary patch literal 985 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Rrn zr;B4q#hkZM=d*(y1?DZ#bunO+=5(FxyyD1Y5tk)gi+(%~`lupuaPsnbfB9`HMDw|t z;#fW&_k82HQlm*%$?3((MNck7co~Qa9h}l-bANl`qkXCi^C!I%zVmm%o_%*e?3+3Sb*6$Cg9DiHfAfDf z+o(KsQBK-+p@%0=muD$fI6kmhcS%O&9AklypE8ReN*VuwG$7{@K1} zaew)@eTU_?`Jd9aWB>DG=Sr6g$_(Enw)66pTI`Ay;B3h0W@+Kcabs{2{A_mck6Oil z{!JX4WCY~w3M3j8w;FsjoU!9NW2SZE^T)sC&&}dof1fc|yJI_pU(`++)@NQfY#3j? zc>g4UeM4g%x60ETp%3x;|!?z)Md9??)R7{mq)|lU*Hi7(W=i(XZwCYPmW7 zKw3Y;yuZ)hCM{7vxJFP(KPNBeNZm3GrU?}#1&=QNX3hD=srYlAg`Mb2&wxtL*IoxB zs!EpJ_S_`ec8c+i_=4};Dx!>5+c`}FRVJ}m{`peZsG`hZxgcC<${bb~rWw2(bAu|k z04-V0QL*ms9`T2UbEkglW_hu^Y<(T0G(-Ej%h^kpmUXba5RdZw%6;VF#wwA2@()=R fj-%i`4Eq^R{r5MQ@BHQp%&QEZu6{1-oD!M}TOP_SOn z<6y*j)StqMJ^&GH2t$bb#)<2-1-G5!xFe{mN_hrg0@LnYi#y0=^#3iWOaUNlI@>1RdZ&3x rp;T`{TC>amvXlWZ00zJSoE=~fl;50qgLasw00000NkvXXu0mjfE8VHQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json new file mode 100644 index 00000000000..c4b34a1feee --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/DesertArmor/uscmarmortwo.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4e796d72dad4793e5e6976b1b373b753c9e3f20a GIT binary patch literal 922 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T>< zr;B4q#hkZMvDw0oB6|<=N8}1^^i;`Mv7%M!>toMb^$Ql%hsuBTtnofD{hFBO5izG| zugSeLj?L0Ku_Jxj?z=g{yUQncUYYsX=1dOJ;uhwaI4cS|FdXY7v*8>Dl^>Si)bHPXE|d-?01mRrA8S}R3WRm3mc zzw@#yLkic7KbO_HXDts?KKj?u#%kTxuVEil9*c7pEUxHXb#;$g)z?pvA`J6ZU)_D> zCEp1ZgTQC|YnMAct@JN`_kOEseQ~rS|vKK!ur&(9!bJgv3 zmcRG^N=^TC?Ops$4d1`c?w@%~g!4l}q2uI*t-pBIFn$01k8P&Q`xWbNH#hHl<|^~x z@3r3xStmKEFnAR3IdVOHeB=J-FV&NGOgSC6al&<_E7H+c>W&p#X6(tUJ#5L~F|X9- zam}ad;2YTvdB$HYcn(w!79;cqGYzjYV;hp_p}E+{ch$eq}*piHLbU*B)JnJt`k z6B%~YJTNM{^WW~u`SXkQJT9{wJHC{C^4Hsk-ye&;aIX0W$Ae{|S`)d#lXlEcYxp?% zOc~?pDa>i6HzOZ7sX7W5Fim($7<>F@n1A%*BV&_QjvtMF?q~4&{6pt_{L0>6%pZK` zc_*wmxiCzA!fQL0#9ew5dYI>E^j?*oyCO?Or)ScUiBSw|Y_dM}{&F+6B92fuB)!jxbzXZ^x`WzT!!4=nL* z)3xHM5Sp}%<4J40y86oFB5xViIMkF{emtU{dr75n<3k?C8?cvwWiwp9i-$Ihd=x;=*O^01{q)D{=m+} X@b2}-UtuqSnT^5I)z4*}Q$iB}_s6T6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorone.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7a278a7f9b6114a161ddb07336877eb0774a0ca9 GIT binary patch literal 355 zcmV-p0i6DcP)Sf{BuYv{Z%C58$WJ@2+hr1>1tC z2jdE@8gpEIk%UHinUElbeV1k4z|L=HhbiOAvH%vq0$70m1>iUhqm;sYzA9bjI-Rx& z!w_0;OAtr~&~nj#XrfxLnfJHPq|oD2*U+DSZ3rN_QU-8)Q-SBzF`mpY8V*eCGxofD ztT!Q~5&?WnXVJ-4vuG^F&#!)xFASj9zl)0Sbek&i`SRG;`lUF4@1FxWge=al_^sta zMR}>jGeBMbHRID@Ci%huijW9kx$vWb1KgC))@y%_V5cCJ2!IQS%P83GQ+^!(wV-kZ zpt$KA2j<*~w2utRGy_?S04Z13q!Z`WCOUuI7~clzDANtVXx@9#)foe#YvQDltgQjPS~R*o~~yTp!&T6$&jMcl7=qHtz=IUkE;v$OpB@@?f) zT@Mz0)e{xFB=`U32K!lCtbg`?z3O7=;nh%fTCByRtzTYjZ`qpq7KMAOS$^5S>=BYx zd%r(P^TS@AB`gR2_1lUoK0nX6=U>QkhG*;7-4UKM!=S9~RZ^TwqEMYCW5Es0zLNs1 zJU(*Gn{;l^Ec5sk{@`T%jogACnUf!=ud?>yce+t`&Of^Jy^KIjSmy`*xjpe!(sRn} z-$t@7vY7N~c72;iu>>Pw?7?lYid$gmKvY-Bw!eSht8kAJu3Yc~jg;oejI-*ctF znZxs1Hfk!T-roJl_SNJ(lOuW)Vzk&d=pTreYztVG#qvU0nD4P4lP04;QeDeW){vVi z6(<=J=dtvB3_EuycMZQ_J?D-mdoRxye(Siu!D~LlFTQIk%?BjTw;jGwdrXYMlP^tU z(X{Jg&%^^b`wkiSGfgU~dN=F2%1>#%sm#lMvYKtbqQ}@`C-Bts$HkYId?qE#h<8w( zp?+$z!sM2vEF8}m>i5pO{%lPV!~4IE{s*?$h_Y%j{@C*Lc;()@kon<}YV)7W{KDcR zoh!l+O3GVl@-S5Kve!J(K9l)NY0W^RH&;b7nz_Ltfn#bV# zBA4FtJXgl?H-urF1BQ42b`i>60S=E0+3S8JL06TMM8EGx2*5d#Ujo-Xp`fS7np7UH zmCqFmARLXM-7)C-7k~EvtNL2@Ts}8$L5Nx6Kir?g%jMO?tiDo+0*s@@FMk`c z0PgD7^1VNVW~)aHsf3=|Z#Cbtn}SggQgHs%fSanF_*nnRbWZzRu>f%X9mk>W-|PVl z|BSvM2!d>T0K+dlo30#hK?&=BSw6#8$%SA6ESC!kUw8X3`46PmnE`B$S$gEQ89_Ec j7SaG3Km%xiy#xFJmyD77!t+0<00000NkvXXu0mjfMgOc1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json new file mode 100644 index 00000000000..8526915be22 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorsmartgunner.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..9a59e05d2e70ea913c5ec6f28181eda50e19f291 GIT binary patch literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?J zr;B4q#hkaZVzY%EMcVv7Fo(@{$r0j|idxmEP#5dj{XqZ1{#D{tx=J41_f||5>Jame z_L{tQ#*tZCCuWo%iZoB$eslA?H?79}Q%;_1t4zOVX+8JNoXshg=NLB0q%%bJ88_%0 zmvor+m}f%G&LBCbNE^n$ZcC! zV*i3+-RrNZuVi~qn5?P)8r8e1d)~D>_g`oIJ@@U<59#(r-(1*gUcGrCw9u?@cGGKq z`P~O=gMZwW+gtN7`1ReLp_fYySa$i(+vj_A*@*_}v#PpnldKskKCJlu*Vo9i-r&m9 zg9ii7+bv?)b^n+B7RMkLHV2k&0T;szw(GyE=k3d%WZcR$)!Q}q&@Z>>^_&KBs%-1M z?|+aIU>93-`Cax~XA;}73!^Rl%5hWuvWm^JUMhQ*c5CQ&I2VbMAc zXQy5Zv6W+NdGzsu^5hM6Y1TaU|1-b1vL$?OJj?NqS>efH*~hFAS><$z95B%`y`^?(ce!tkb>9^n$m6Ga%D=*&Q zQGMy2#BA`{V)Ffn`#e(e-CB0*_m`J**1x*>+1$obv<>)`#(#IChhPIWbxs1`G0QR%bJEt7oeVV*7bTP zRA#!X{cf=N%sT0XLZ{MnR|Bp115cD0DvtS|_MGsB)rIX0pPpX)0Tmg>LQBp|oC1;t zvxONRePZ=t=-uFV#mD=%qLG5$mQSa|Jr*UGX#cT)#Df}S*Q7tNcZpw@>U*uY6_}eC NJYD@<);T3K0RXmckR$*A literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmorthree.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb7546fab1d2d012e541616a4f61301a499cead GIT binary patch literal 351 zcmV-l0igbgP)f z_&|G%P9Q}Eh13=iGMBKs(D|B9H%dR22G9T+Km+_2fMKLKV~m!|P2_b}DCD{8y5u;g z2q{Pnz|4_d&Qd&?;N#KEGpf}q9R10B4*-=%ssUuuF|w>Ab$biyv|C*EQCn7tc6*mp zr35gYEX0YchN%?l{&4HfLj$PVMPY)o*)YAnG)LcY2H^o5j#okmb6F-#rBJU|Ow3iK zoPl?`2lL}R5CAEJ&ClC@4X|EqMd0jm?WvDXfDByDEL;FAAS@&N0l4xg?n#9Q!&JEZ85iqMvI~hl1vhNjH>^ zW@N4qnv`?IMx33P%ukz3OZnrA!Z>~=^>G&~Q= zoVaVR;!74YtsnX^IstX}9?qF>UusdGTz>9%XmqBpDx;mrtQwaUKeK{A{3+WlyyrUW z_RCAB>(>?Rlh$UnV|P5T`{R$ZF4Xj12`w_@02>I!9IoEnKY~MAN$xP{I$cx%3V|ZWqVWk(tV{^-!tT~JRvrf8| zBedZ^&%}otm?jX!0b&gEj~YHQHd*CZH1kh9!_vx{Y2xuKw|--PFnfR0_F(b`LJt+*ZQ^b?q{2h_O`4nYIwnYK;u-HLBMp5MZE3>obNIh#K=uooW9(3 z|AEcVOJ!IuF;@J0H}`6Qzta{KKI!x6#y^b1M2?6tbU&>c|U6kc*n*tyt2*j33hpk@9Y{Rt^74fP>HAv?J>I0ZuQ=ud6`&3dddRgB^M;@+$i z(_W;7{+!ApvHaVLI!0NB_A|z(F0U%n;55+NGU=6g$Kl0awf@*2;&Ny^jEpN7>zI#g XxthH_U;G%DJsCV*{an^LB{Ts5q~E|v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/icon.png b/Resources/Textures/_AU14/Clothing/JungleArmor/uscmarmortwo.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5624a852470da9e7a7d9b54ee09e51b9fa41288a GIT binary patch literal 384 zcmV-`0e}99P)1RCt{2l}$^-KoExCf|saO!8BpfVo?hsrAIG4>501xoL0K#y^1VMn|FsaSP zn$6f`Sq80NYp{?VK-55cdmT&lWpjITUnJVw-!b&}9wr2^`K2Ae+Ug>ds^k1(fRp0` zlly5a)xvm^!B$oPcfEmp*=i=uMf>tPE#l4qcH3K$grhh*Y$1*nl4OL_v%dHl*ZRsG z!1K!oxP+WHD{hRY(stVK(>ICR%6bPVChc~jq638aTFfHu41i*#)XxsEa{8SEJUyne za2uP^uMX&REODm*JU~1~O!PhPzWDR5{B@uz1)zB8!Vq%xX8kCkQg1=oWR(F_DG%TQ eJb(w7JHRI+IG5{nCIeak0000PpB%vNykPF8;F)?;jY zZTK>bey*AEv8q=0&b{2rzbjnMH(%$fJk)M?nxR9!q%V1)hk?ms3Fg0X;*1mY7wo^6 zvFyu7`(upZ^Y^mcYxCdi@MfdY0hivJW*w=UcRKTb-~Oh06K}(X;}sJ7)ei2+4@iwX zv-+$NgQUZ@v)R{5@86iZoul@fT!PX2RSfs59j4_8{@tl{AT)2E_JPn!*Dqf!8-6pU z?C;t7Z~8x_M9GHso&>2Q_xB$xnXoI*e$I~r*Ul%&)t0gTn3r<%*Dm%61y>k^`lK8V z1u|oL5h{7$FT=SPXYX6AdUf~9v|rkV&sPZFdM*<8oB2XVf`3*1e}kN@?jL8of5stw zStIcm(;F29w{!l_ck&+SUA_8he3E$ja#5CMg@U~M?@OKUi#GPmmTNryd9nrDZ>yx9 z6S+=#%mt4%9x$LqKjM|W!z3LefiY!#r{QX=;8F7`<+y(R#vyz1YpWz@O1TaS?83{1ORSOF=GG# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/icon.png b/Resources/Textures/_AU14/Clothing/ballisticarmor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ca3327d86c920bfe6981932eaedcea9e254639b1 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0t1& z#WAE}&f6*W+=mPVj`|mbYi0a3-<4AE@wWBu&TeP1>l&dOLLIH#)>kwqU1?e3xPx8w zspzHqyRFx8PCUxMbAW;8Lp(!sp#S#Cd~-f2zqzvS%k!%~hrVEEJs_7HWp%%npQ~Z%@+ZrV0DS nu+nxb!;UUSi3Y|+%y$?jzDvsAEAw|1(1#43u6{1-oD!M}_S*uU#G1?Y!P-?1}zUWWa9lo5EOpw}IJ5*AW_^kLH}$ZBm{t zV!t$~^$yyHo%WH!u-2y$)(oIv&>9NA6>#~=P^YJPYuqYx8sSIE`thQCKS{agrsaB~0sq>Mk-vi?H z0(lUvN#Kf4%P)GXL1!x^|?dg|C!XCJ^Ad;R({ zk1ORc(r5L*F%f{7_D(O*?O<}oi~_tJkpjs9Bw=EJr{|d{ZWVx%Q*QQ~eW&UEgZ=k@ z{6ks=&=cMsgr8#^Mm|g~y#Zo?7{a3czaex04!{980NeHs7FMA;qS)8^00000NkvXX Hu0mjf&TO_R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json new file mode 100644 index 00000000000..5258e1be065 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/pilotflakvest.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..87e9b63cf76aa891328061d6c0dab1036162aba8 GIT binary patch literal 931 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|RrY zr;B4q#hkZMj@iPFB6W>QElF9*Sy#MlT_$pT4bbLrywWUJEwqQ@AH)C7aN7!DeL0&- zq3RW`OsuQfS(`KXy8>5Vy5i;)s`a>T^1dB>(!297i?1}kpSo-F+nW4+Gb?4k)iOV^ zY+^vilj7y%^k)1?n0L?I?%AF4-)`S#T%8&k6_xeWgYyjkkz@w*TRMM~7{AF$EOee) zSQT2I^y>U8*+r)!j;{Ic&UnR>d&VD^uXCPuChVwpFI?W6z0Qo4(IvTyMM7)Zi-eyW zRA=p}SSidf@8bW=hp}Ils57XY`m^}y;w`(k+%MWUvp(;)qR$p%kot;`UpD4$yeh!L ze7--6-|GF=4-a#j-`(Ap_|q@s{0%!FnLXRr#h*1<=Fy;hyf4~lOThfb&9J_p+02JM^`2-CoPV|Nj0~OU^@! zk3PBRRXo9ho#E}~f6^7le&+1Iewxw#8c%KBw#j!^exAI|_0!{uO&{`CRx{+6#&w)+ z@LHpWMZ{{x)l_a!3DxU%uMA zzM4+@b@gKIq)Xfa%E5duuBZHN)Sb#=D!`&}UXUQ3@Q=~1d-2iqjF9F>sh{c@r#$-@ zIqx;=s(%bMlb;JoWEBZtExf{#Bj0pk9rupH2H~ZKS2%ZOO_7f=nPd^f-7wYNx2`PB z>iE~~J8wli#;{an^LB{Ts5jYpXN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/icon.png b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e529d97f563a58c1edcfb6a62da9f4d631b019d GIT binary patch literal 357 zcmV-r0h<1aP)(098@HO4*EU1cJYfkREI#p zKZAln&_#?I1+@y|_?i=wRD#QsJVbbB3HMyc`Q_$vU+BS-01`j~NPy=8P?Q*pzD8+j zt|P(TM>fsQr!(#M#|UwV3*bGMrJ`1&iP2}q(C~w_ipE^u1~7PD$p;WmsFW|1sH->W z^Q*x;A2s}qwXiFJ0OLW=d1BNE^@O^kxBR{^fO56&gy5M{Gro^6_xzvsw>W^q&LS)! z!ZGq|&88!#&nxa7fG+>~U#Q;_Nw+U>2SkVq0At3&1%=VC<|h5_wqgNrfN+e0L0*09 zK!pkbxtGqqdgd*kTX*fiyKCri^00000NkvXXu0mjf DPo|oj literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json new file mode 100644 index 00000000000..d5bb8c3505c --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/uacgarmor.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/2550250608085a8418995ece0b9fe56f74132085/icons/obj/items/clothing/cm_suits.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/502ddbcf292265a7e7be17def0735a2fc7141dc8/icons/mob/humans/onmob/suit_1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file From 5758fbe1f91ff48d34b0573c20a2952b30420a0c Mon Sep 17 00:00:00 2001 From: Orion <58231741+troytroy400@users.noreply.github.com> Date: Thu, 27 Mar 2025 18:59:58 -0700 Subject: [PATCH 04/21] Merge pull request #44 from troytroy400/evenmoreclothing Port PvE Clothing --- .../_AU14/Entities/Clothing/jumpsuits.yml | 26 +++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1202 bytes .../Clothing/desertfatigues.rsi/icon.png | Bin 0 -> 441 bytes .../jacket-equipped-INNERCLOTHING.png | Bin 0 -> 732 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1196 bytes .../junglefatigues.rsi/icon.png | Bin 0 -> 437 bytes .../jacket-equipped-INNERCLOTHING.png | Bin 0 -> 732 bytes .../junglefatigues.rsi/meta.json | 30 ++++++++++++++++++ .../sleeveless-equipped-INNERCLOTHING.png | Bin 0 -> 1085 bytes .../sleeves-equipped-INNERCLOTHING.png | Bin 0 -> 1155 bytes .../Clothing/desertfatigues.rsi/meta.json | 30 ++++++++++++++++++ .../sleeveless-equipped-INNERCLOTHING.png | Bin 0 -> 1091 bytes .../sleeves-equipped-INNERCLOTHING.png | Bin 0 -> 1159 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1196 bytes .../Clothing/junglefatigues.rsi/icon.png | Bin 0 -> 437 bytes .../jacket-equipped-INNERCLOTHING.png | Bin 0 -> 732 bytes .../Clothing/junglefatigues.rsi/meta.json | 30 ++++++++++++++++++ .../sleeveless-equipped-INNERCLOTHING.png | Bin 0 -> 1085 bytes .../sleeves-equipped-INNERCLOTHING.png | Bin 0 -> 1155 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 2053 bytes .../Clothing/tacticalflightsuit.rsi/icon.png | Bin 0 -> 717 bytes .../Clothing/tacticalflightsuit.rsi/meta.json | 22 +++++++++++++ .../sleeves-equipped-INNERCLOTHING.png | Bin 0 -> 1597 bytes 23 files changed, 138 insertions(+) create mode 100644 Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/jacket-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/jacket-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeveless-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeveless-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeves-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/junglefatigues.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/junglefatigues.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/junglefatigues.rsi/jacket-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/junglefatigues.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeveless-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/sleeves-equipped-INNERCLOTHING.png diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml b/Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml new file mode 100644 index 00000000000..08b590219ce --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/jumpsuits.yml @@ -0,0 +1,26 @@ +- type: entity + parent: [RMCMarineUniformBase, RMCAlternateFoldableUniformBase] + id: AU14DesertFatigues + name: USCM Desert fatigues + description: Standard-issue USCM fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets. + components: + - type: Sprite + sprite: _AU14/Clothing/desertfatigues.rsi + +- type: entity + parent: [RMCMarineUniformBase, RMCAlternateFoldableUniformBase] + id: AU14JungleFatigues + name: USCM Jungle fatigues + description: Standard-issue USCM fatigues. They have shards of light Kevlar to help protect against stabbing weapons and bullets. + components: + - type: Sprite + sprite: _AU14/Clothing/junglefatigues.rsi + +- type: entity + parent: [RMCMarineUniformBase, RMCAlternateFoldableUniformBase] + id: AU14TacticalFlightSuit + name: Aircrew Flightsuit + description: Standard-issue USCM flightsuit. It has integrated life support mechanisms. + components: + - type: Sprite + sprite: _AU14/Clothing/tacticalflightsuit.rsi \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..47ed0003dc07975d0e59bb17e8c3e117ec99bce3 GIT binary patch literal 1202 zcmV;j1Wo&iP)lxBcys!|#IJR>#cc z&lP}*;(9zfYu&tYEpneh!vXeyc`m2Nio)hU_HFyx(1fTmjIV@yC>*FhIArhXBSQ?&Ep)cfRob zAI@s2n~o`7E}Tlmr7^ay}@^LkCRkL%L zLAb&zP(KV11i6^ZKb?e^pjTp5(n2KwT%J7+AjrVl%<`h^ei8oFH0lEw8%)X_FMjn9 zu%oa8nYtzFVMyp9P&R+FA)uLfYcm~08(>!34mP~Y(xM| znT0$TkOid8$PF-ir2QYY0Bk%rA(L&Yfae0Tz;rpe4Px80BB%tg8_(p(s~68qT3RH$ z2zJ60+|x99Duhx5wFlS-6|gyh9b!9!8yZZQf|EATCUai_?@7?!mP!vK$jCXm5(+$x zVvBxJ%6uNY1fbj5nPM0eIxzx(g9%v(!EJK;#E1r7$NQ!Hr75FV&@AqPz!*i z=l?|HWDHi383Nz|_UJa|sQcN$94H%(JH`)aL`9_8&!W-o8szM^J(*)?rRS5Qe_!E@_=*OY QZ~y=R07*qoM6N<$f{e2rS^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/icon.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7ab123518bf1026f401a7326c34b2932eeadea4f GIT binary patch literal 441 zcmV;q0Y?6bP)RSpU;5XU(QL>9pB zQS_#*0H6XY2e6O06jlT>ITKbO4H$=b5mFzjCew8M{BTZ@DBc28w^;7dg{mAFjNVNg{v$3` zL1e*Q^U8cUK=$S}poIAw1h6LXvw9%P{R5oboGY3@=Bw_5_-SDF^K&GZ_%9;BB&1zl jD1kEI2si?cfFrO6(d@&q9(wjC00000NkvXXu0mjfTAjGY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/jacket-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/jacket-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5d10c4c68b056a3775bc7bf3699d645ac03aae32 GIT binary patch literal 732 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qf^ zr;B4q#hkaZY_mlIMcVE+to9Xy@1{a;6j;mo@O;fkpACP~{zhT=ZqfjZu zqhj1fYs8eq)Py;9s099Dyk5D!`jG|aB;(!XL32Kvd{3TMdA|1jah*BUtj7wO6J*R8 z@K6q)AKOH8Zm+sNLHB;g+q;jn<@oZBS5=lYy}vyFhBp872_4Jo=5G6?#jLT}wb|FfpK*G^;lx^(T;@cE2$em=gLW2`VOM)b}6Gii#da~iUYU1A-> zo;t3qpMQ!$uX1MLr?T`dUlKOUFFE^M^WpEES6%Y|JS_IL&tJO!9#eC#_42od|Ma}S z8Be$popABjKglb9W_b6g+s&Q!R894Jf_SvUwuIpQk^42Yn19TD>ZpD{=4E%t-{oIj zKKwQMVf?H2musNp0ei`_@7H`;dgr(1*S|asg?AVvj`QNDu6$>n^|Sos&B^&s1(#jU z-1M7q$@SN*Uvn(4o!`x05ZCkHxz_%{%MXDSUw`?ERG8i2(wRAXa!YC|L(rjv-gXma zegFNs(KE`f`sbs{3-$rK1XGAr3W-5TA^rkE z3xAA-zro5zgN0>^1cD)i6e1Q$E)ww2Ao&67eY^MVz8f!l`{s5w#qQVa&Ft=dZ@zgm z^LE}`k(#3sKx&Rg0I4||0i@<=1dy7e5y0~B`r2~T`*|j<`C0k!acgE$ec8}F3$1oq zf6_Y=U;e@ZfSjbA&RtwmW0LYgY}ERiL?J{VKe#qNZ;sr99ji|s$)B@xGk+lgNZ#$- zk-6EcvcG?jHX2u!Z?|p@pD$Mg&A+$*J#H+yfaBh2+<4r#@=p{1L2lJC6Zvxm zprW`Q^-gDQ-nbUI&!FJ|dmwx6;vOps&A+qzZRWwfr6}+D0dM@A$WmecTmhiCdqodm z2mmKNNq>v9(;jf&^ToLTfzTPJjMV47cM)<0KyMzY$p#7obbCDnFb;7a&%5vW!uNkH z@0lY(w+A>I>mCRVh+P&;0%R_g%(R=^Khk@gq(UO^|9$yQ0>H&N2f+0~$~AhSbuL@m zds2q$=kaHer;DUhto$YcK+Z@IZiq5g0k}VmLV0Ibf`Q)v;CH_TShn(;=Kw}s=xrE; zE4%{rFf25Z`KKN867))}N>-QzfXlPT0R$OXn^~TA-7mtAp+-K&21&W?#cv)0Itqik z(JfIALqZRMviX}05zE7HG0gbchlh-OAXPC0I0RjO_jgg4;{g3(!ny*v42j7;e!N%&7Av#}Rfmr}7J^v>nlQCFD zW(a@>=-px1f=m&vOyL)WIWdA6mK&4fPK;az^k(TGE{H6{(3}_0$d02_3*Gzfk{5Ip z7`N}vIuIZBeoJWJOv2)@k$LtMh53BIv$e<3+js9{)e)57iglP1P`}@okXUS8PxFD` zgv&Gddh_~4WIdx`5@6_V5u-5xGclIJt!=+p+zJl6gg=Q$2frgsz-WBXP?!d^=9eRV zI0|QXt7yEoVQ`6fE&+f5m3#~V81IPxFB=#F)1FQ65e?U*Qm;O*M>d9jd z3Zj&dgNO&)vCSHO;tnK;uKY#2n?N33s}i+!&XUwhr|&zZ&w+vbScoIenBm_0zRZH4xU zH8$E`z6VPl(A4*zv!~8DV%P4il1t9N)_nMP=M|UtA70eD+UGA>AIG%!-P`zDKl7Q> zY|c9b={LH*{+%80Io;3j-H(!}WwW=$H0SCtMmClH{q=GGBBO@)k$EMb&P^>gJ~s8S z$%lVNKkUC=^ZQFWv6C}N%Jf(veh*1Jv;wb%Bw2S)l7lRZBAA1C%0XffJcwT) z=)sTi;5T^kqQQg5J!~Kt!muMKx&RifaaecudgJ-Z->%YoR_!ndUNNsR}ELrQlpu- z9}M@zSH6k>3T?M<;*l$py$>e+J+T7Dhpdec-DB<0W9`8``E_`tmaih9)4m}K^B1Mx zALK^k$@lAxYhnq=-|2rzjdf-155K3zqhAXZ0q-|H%EPtQR2Yl~^PG7ognmn4e9D5+ z1m2;Ok9-vYnZc5J!NUC11B(4tIBk3w&vifx6#FqHhaNYiTuv;fglnaA6G zpdx@XK(}{80CDIu1OFQ8Ot3fuT#bEazz5lWUk%hDkYSMi?QVX}`w;)rejA)MzOQ_B z2yhL6>q98=0(ikv<4Ag&JEkE3`P0m^h-^|!7eNSTCI~m=wg~r!Qr6obzX2e>_$|P9 zt$g(wz^n_i4TbQ8SD+n=StDD2nyFlZUWr{v3w0jA83*v?b?4S{!uJrFAVQ7uwzfYz z@|$5YK{pG7yU{Jt4n?d(plbQ?Kt%J;a51d-Zrba9AcY74hG0>C@%OAy=K=f-=AP^3 z1|jkQ8h=v0*yjP`J$A0R&$7)j_ATYdH9%^PNPyHFkpQVVA^}o!L;|Gdhy+N@;Y9#W zVQ>%u;4xEcJC2$F8qY(>?3k)KR!EXiB*1vcr0gk{6Dx8$GTC;cTXm~|JNv~gPwNq$^#Lc_ zAb5B9Q>=lSgx18!v-Fu2>iU33>-UpauivDsBM-n6i4hm0(P$)=Xf-b9_koZ(PKER2 z>*b55iMB>TMZm<}5@urnR$^?0y-mMdTnmO>CO^wa$G;OSz%br46{Z4>#g)V@jzaBj z2;*HH#*c(`2>=KP@-YM;-mS}GX8}T>Y;A%U0q&hV3nfEuk5%bVDiPZM4{8F->fjv$ z8Ja;#WG!{@BEa2iL(~Ua>fl8{$eI9a9pa&=)Es{Ry;j7IrVY=@00000NkvXXu0mjf Dg>Udr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0a313555ee7cb5a688069e682cb5b15c2b325bf8 GIT binary patch literal 1155 zcmV-}1bq96P)Cf2&NFL6cU4wLi`1S z7XBCue}k2c1`Ep+2?Rq3DMV5vxk$i6gX9OS_wC-dI~gyzeX}zgVdrc1W_EACH{ZNB z^LA#gNW&2YkcJ})APq+pKpKuHfHWLY0L{ZI%L_^W$BDFOrsTuN_12_%-!OS*+nv1r zsDB`?{G|l|IZ3>S>MagxtJw zEwS&R;Q)K!pnu#tFx=Az$p7Hpd~(rqL;GZN>sxDctNgoF(;#~QApjipCI2nbF?t{z zAaucbw%!FQ0iZBIw>LuoaftiAdp|VPnV{VR9F1Ljzy%Q77t|q;AscDeHumy+9Hc_x zqW8PvRm6(;ZPzeB+XO9DzpD{PHd|syJ z3wS?5jeMB%3;vE1zd8iWEDY{Ow?sV*2^|8y`Qw6!=3%%PM*QN#L(Y64)e!;=L7U(H zT^8y*fL~>tbIshKjy!;k|Ce9F=Ki^JP4Z0QlkS2!}6Nc0iH%NML%!Ld=k_GynXjRcds|EUnC3#7!-PA1ONv&WFZ8W z$zjtl^wPRXTj(|_O@myIuN#beo(!piN&*z|mc?KlJ3|0Gz+N48g?eM8j>XR^(Aucp z7ch}cH@cYf0kik*DKF?OFmBzQbs*mF|B}$anS{AfBQLV2EY#-%o-IF4I1?Z#!4>l` z2cyAYAR#f=zMk&~f^(P(=gAjlCG8mnl>j4mOPGxT7>O|zu5Y;I;#x55GX5+h9sW)* z0Hg6iQ(+p=o>@rD!%;Z9TSwzf8-|yJ=Mn%2P|L>fk0vS49va!pw!ASsfuC3#IU`QLB1gP^&KxiA{qNp?+e*v%S VAn0PFX&(Rp002ovPDHLkV1koC1Azbl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json new file mode 100644 index 00000000000..8dcd8baa721 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/mob/humans/onmob/uniform_0.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/obj/items/clothing/uniforms.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/7840aeb2f66b3ed37af23dbd4025ae676b3be6c4/icons/obj/items/clothing/uniforms.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "sleeves-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "sleeveless-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "jacket-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeveless-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeveless-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..075423374c354963b9dcef98697ab3202f12158e GIT binary patch literal 1091 zcmV-J1ibr+P)ST z+nIMoT8>D7v>cHDX*nVR(sD!sq~(YNX#Tv`Urok`zoavNT|R6KX3lGG8m^p$PPc5| zAMc8g6#*aDH{|J)ekKe?gL%$86hglxFg|6$ zXaeuh$w$75fXv_&@PfJ7sRva1t#I1-FrMpx7AgV|?{Go78oYq6h<5aEi5-4U{>W;t zcdDy@-riA<>E!_~U^w7A0~*}CaqZmx-SL5Fpdx@XfDi!o$5Q?l>3Yq879e^m^LV=t zR0MDa==N?1AP#+I;Ig641gkT^)!26ie30+=%|IOj8Pb^tHitjTKE!|7Z-leP_m!^> z0j>dXeF#Nf054cbXJs%PnuY-6mzif3#iW=nf)LJ35N^nA5$+GAthYga1B}YFI|tre|z?av9d&>#mLu7&rMb-yw zec5*8cf(|YZWgvBQ@2Dr6tND0rsc;25zU|BVp#FrwAcMW3K0Sf!K(b~?~6j62k25+E%{BtTk@NPx5)kpO8qA_3BJ zcoBe87#u_ZxD2_!ykuGza1u}}K-mDk5OG4J9Y;+7jprd`c1)H2Uh7K|iUb%BnUq~3 z)lEx+iU8MmUXHwe`8>OpX3>N-2{4{D36MR#CNGFklA!j0+`vJp3{HrtkoAcWz?uZe zxGCA8OP`BET_5nQ|0sF;?tR8O@&G)M7;!P0OeSK9rOteL z9|)OgDqJRCZ(hAfv^5GU0t$Can2iBgiLn(9hJLxY77V*wex8x0zY{FLFy1s3rUIRm z0Jk^_wYwpVcXdb~3F{I75D?^J2td4Bm&INL2!Xn_30?%ack(Qh481)zr9-Vm$SqjD zEY#J(I|OocgOtcx>fl9yyVr)O546<5i-3?d0oFRiLs4lt{sCsj!d6!MAkqK;002ov JPDHLkV1h7Z=d1t# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/sleeves-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5e48bb53e224fd3196ef336f1cf3b4401b3ba105 GIT binary patch literal 1159 zcmV;21bF+2P)777qzKA!S_Dav-hA`k z%-flFO&X3UfHWLY0BJa)0Mc+o0i@xG0%#uI=&dEg(_hkFyeS{IcIKvCuNpQ_tKBiz zkB5ii%RjRKASdbS{d+hVW3uya-!r2&dXj_?f&Adw{Jeec9_(0u`dH3>|5fwPBml{~ zt9NB#{<;j(#!H=x5SpyV}FQRw9DSPcEDjIEPI>{4;p~$V`J%zzY`U3lAVDNY!xpU7+zC z2ekZC1;|xQzU&>y!I*>kCVvio&!ZddVc)ilT+KnMWGLovTaIzP*n>0glGLJ>Ua~T@}}Y74ZI6p7jBk^9%lt7r#0L>?~|o3b({{7!o=Js^*UiBASQcVi@twhlj|y52QLm zfFbDeyT50JIuGDi8RuL(H>e{IVB`Pe7YUySO#0B_wUDtNl0S|C(r`opq~VAHNW&2Y zkcJ})APq+pKpGA&0k8^#g$RIKW+CeWCIOqKejb}{)xQlJ_TnMEIY7ejr6|gvg6=E6`dPNA} z7C1O*18p+*74RMe?PaOFAVG#s=}IWD8pRglxF{+O Z$3L4TAzdpeN0I;l002ovPDHLkV1gZ#5`+K% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4f878fa3f8738c86369eaa251bd3aeef024297c8 GIT binary patch literal 1196 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 Dg>Udr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0a313555ee7cb5a688069e682cb5b15c2b325bf8 GIT binary patch literal 1155 zcmV-}1bq96P)Cf2&NFL6cU4wLi`1S z7XBCue}k2c1`Ep+2?Rq3DMV5vxk$i6gX9OS_wC-dI~gyzeX}zgVdrc1W_EACH{ZNB z^LA#gNW&2YkcJ})APq+pKpKuHfHWLY0L{ZI%L_^W$BDFOrsTuN_12_%-!OS*+nv1r zsDB`?{G|l|IZ3>S>MagxtJw zEwS&R;Q)K!pnu#tFx=Az$p7Hpd~(rqL;GZN>sxDctNgoF(;#~QApjipCI2nbF?t{z zAaucbw%!FQ0iZBIw>LuoaftiAdp|VPnV{VR9F1Ljzy%Q77t|q;AscDeHumy+9Hc_x zqW8PvRm6(;ZPzeB+XO9DzpD{PHd|syJ z3wS?5jeMB%3;vE1zd8iWEDY{Ow?sV*2^|8y`Qw6!=3%%PM*QN#L(Y64)e!;=L7U(H zT^8y*fL~>tbIshKjy!;k|Ce9F=Ki^JP4Z0QlkS2!}6Nc0iH%NML%!Ld=k_GynXjRcds|EUnC3#7!-PA1ONv&WFZ8W z$zjtl^wPRXTj(|_O@myIuN#beo(!piN&*z|mc?KlJ3|0Gz+N48g?eM8j>XR^(Aucp z7ch}cH@cYf0kik*DKF?OFmBzQbs*mF|B}$anS{AfBQLV2EY#-%o-IF4I1?Z#!4>l` z2cyAYAR#f=zMk&~f^(P(=gAjlCG8mnl>j4mOPGxT7>O|zu5Y;I;#x55GX5+h9sW)* z0Hg6iQ(+p=o>@rD!%;Z9TSwzf8-|yJ=Mn%2P|L>fk0vS49va!pw!ASsfuC3#IU`QLB1gP^&KxiA{qNp?+e*v%S VAn0PFX&(Rp002ovPDHLkV1koC1Azbl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/tacticalflightsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4e4edf042d2ff8f2ce0551a345ec3255505e6f33 GIT binary patch literal 2053 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 Date: Thu, 27 Mar 2025 20:51:10 -0700 Subject: [PATCH 05/21] Merge pull request #45 from troytroy400/goggles Port PvE Goggles --- .../_AU14/Entities/Clothing/goggles.yml | 74 ++++++++++++++++++ .../Goggles/m1a1.rsi/equipped-EYES.png | Bin 0 -> 482 bytes .../Goggles/m1a1.rsi/equipped-MASK.png | Bin 0 -> 482 bytes .../Clothing/Goggles/m1a1.rsi/helmet-down.png | Bin 0 -> 576 bytes .../Clothing/Goggles/m1a1.rsi/helmet.png | Bin 0 -> 513 bytes .../_AU14/Clothing/Goggles/m1a1.rsi/icon.png | Bin 0 -> 344 bytes .../_AU14/Clothing/Goggles/m1a1.rsi/meta.json | 30 +++++++ .../Goggles/m1a1clear.rsi/equipped-EYES.png | Bin 0 -> 480 bytes .../Goggles/m1a1clear.rsi/equipped-MASK.png | Bin 0 -> 480 bytes .../Goggles/m1a1clear.rsi/helmet-down.png | Bin 0 -> 578 bytes .../Clothing/Goggles/m1a1clear.rsi/helmet.png | Bin 0 -> 514 bytes .../Clothing/Goggles/m1a1clear.rsi/icon.png | Bin 0 -> 460 bytes .../Clothing/Goggles/m1a1clear.rsi/meta.json | 30 +++++++ .../Goggles/m1a1dark.rsi/equipped-EYES.png | Bin 0 -> 447 bytes .../Goggles/m1a1dark.rsi/equipped-MASK.png | Bin 0 -> 447 bytes .../Goggles/m1a1dark.rsi/helmet-down.png | Bin 0 -> 543 bytes .../Clothing/Goggles/m1a1dark.rsi/helmet.png | Bin 0 -> 478 bytes .../Clothing/Goggles/m1a1dark.rsi/icon.png | Bin 0 -> 456 bytes .../Clothing/Goggles/m1a1dark.rsi/meta.json | 30 +++++++ .../Goggles/m1a1darkalt.rsi/equipped-EYES.png | Bin 0 -> 454 bytes .../Goggles/m1a1darkalt.rsi/equipped-MASK.png | Bin 0 -> 454 bytes .../Goggles/m1a1darkalt.rsi/helmet-down.png | Bin 0 -> 542 bytes .../Goggles/m1a1darkalt.rsi/helmet.png | Bin 0 -> 477 bytes .../Clothing/Goggles/m1a1darkalt.rsi/icon.png | Bin 0 -> 476 bytes .../Goggles/m1a1darkalt.rsi/meta.json | 30 +++++++ .../Goggles/m1a1green.rsi/equipped-EYES.png | Bin 0 -> 465 bytes .../Goggles/m1a1green.rsi/equipped-MASK.png | Bin 0 -> 465 bytes .../Goggles/m1a1green.rsi/helmet-down.png | Bin 0 -> 569 bytes .../Clothing/Goggles/m1a1green.rsi/helmet.png | Bin 0 -> 500 bytes .../Clothing/Goggles/m1a1green.rsi/icon.png | Bin 0 -> 457 bytes .../Clothing/Goggles/m1a1green.rsi/meta.json | 30 +++++++ 31 files changed, 224 insertions(+) create mode 100644 Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet-down.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet-down.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet-down.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet-down.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet-down.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml b/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml new file mode 100644 index 00000000000..98999afbe41 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml @@ -0,0 +1,74 @@ +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1ClearBallistic + name: clear M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1clear.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1clear.rsi + - type: HelmetAccessory + rsi: + sprite: _AU14/Clothing/Goggles/m1a1clear.rsi + state: helmet + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1Ballistic + name: M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1.rsi + - type: HelmetAccessory + rsi: + sprite: _AU14/Clothing/Goggles/m1a1.rsi + state: helmet + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1DarkBallistic + name: dark M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1dark.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1dark.rsi + - type: HelmetAccessory + rsi: + sprite: _AU14/Clothing/Goggles/m1a1dark.rsi + state: helmet + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM60 + name: M60 ballistic goggles + description: Older issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi + - type: HelmetAccessory + rsi: + sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi + state: helmet + +- type: entity + parent: RMCGogglesBallistic + id: AU14GogglesM1A1LaserBallistic + name: laser shielded M1A1 ballistic goggles + description: Newer issue USCM goggles. They are capable of preventing insects, dust, and other things from getting into one's eyes. Also protects your eyes from lasers! + components: + - type: Sprite + sprite: _AU14/Clothing/Goggles/m1a1green.rsi + - type: Clothing + sprite: _AU14/Clothing/Goggles/m1a1green.rsi + - type: HelmetAccessory + rsi: + sprite: _AU14/Clothing/Goggles/m1a1green.rsi + state: helmet \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..373bbb9ac5e896acd25f5e340d4eed8ea94d312d GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vm} zPZ!6KiaBp*8G0XfU}%l+Zl2w|POnKp_Q=VD7tfxQf3T{#*>9a6pPrx9j*_qJ9o>@` zHwT{-n9{_m&3bWKm&hEc;)5pyg}ylXX}quXKGgc@o!zC=1^HZ0JQz+)WS9`_<&eBn zF!lH$g*Ayxg+d#4ZW7pf{IbQJ`x*Pb-mgFQJT1MTq$^|Nzs}Rw7MlxZ?mKyMQs3@p z)|@YR>VLJUPJ3{XcYGb*?_PK&c6Tv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..373bbb9ac5e896acd25f5e340d4eed8ea94d312d GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vm} zPZ!6KiaBp*8G0XfU}%l+Zl2w|POnKp_Q=VD7tfxQf3T{#*>9a6pPrx9j*_qJ9o>@` zHwT{-n9{_m&3bWKm&hEc;)5pyg}ylXX}quXKGgc@o!zC=1^HZ0JQz+)WS9`_<&eBn zF!lH$g*Ayxg+d#4ZW7pf{IbQJ`x*Pb-mgFQJT1MTq$^|Nzs}Rw7MlxZ?mKyMQs3@p z)|@YR>VLJUPJ3{XcYGb*?_PK&c6Tv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/helmet-down.png new file mode 100644 index 0000000000000000000000000000000000000000..d9520edb44950428d8a6e74558c7d0649a09b3c7 GIT binary patch literal 576 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnH zPZ!6KiaBp*ZS-a;6gj?Mj?d9~l9$3&0hWgfx?kD1n11!Yu^_y6^8E>{aME%#>0m zGkcy@*z5C|%L})6{O9*=3;ukn+W*Z#31{#8XDQdG3vCdQ^cQ{YVcol1b&-UoZ~mfH z61E$seZ1DUx}lt@&G+X@K>_!z{(J6!z5ih1efUEI>{zuN8vuOIu*^&Z?Cem7@#7pHCfVj(1SWbd7cifvZCVHY;>vE9KVHRgOXwU|bY*p1Lh|wreEcWnR6ak_NE0%u zR$n(sd`BI3MqAUnO2*fdmNOMCzwTMB=D6mq*mb75bKD1#kK9h5V9d$4|`o!aaQv9kA?Zl!rf%zgI z_zQ&!wrm$RYYv?wCx7qDulJWf_I@>;6RW6G8NXxg-Y05@p8a3@Z_n>c3(gPh@)B(G zH=MOMkM`&9U)$aM_mOAGY8#m^533nJ9eK9>a{8jl5y^iXukTzox#3rKdCvDgzw-VF zzu0o0>*6uzJJ*k0mwnQGcE4yv;;f8ppXGN;?P|IIvfoI%yzYO~8rRpF3`HsoPdpe- zOk|j#%&6ebuH5ZzK-;9Yi^HYm&GEbPu{SR+U3$#bN!FtQGcm~2;mt2_Q?&ezNOvp-otLtd8W4_ zr>|#Y@7az=%bC`2Zaem4*0YTlelu=<^m5PQPg{PSJiE*7c@-BncVKa#B;)60r=t!W SKKB$DrwpF1elF{r5}E*3Oy9l$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1454a60ecbd4a3a0238d246b9db74db500f79eda GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|B z)5S5QV$R!1`?(Go2pl_a-#pt{h2xRRB8444g!1fG&(>FLQqp*&5}RcFgCVMV>gug( zTQx-m-z|voc(?EUb?;Xn9w#uc0nrbB2F=t5N?I))o32Ss37UF{A;qVulDSv7)={iQ zl;P~j9hdVOqHWYaa311n=+!WgD@`z)yJyZ;m&-REzxJN;yjyk6_P8~TmMjL}A{ehk zIX;|n(@)tQ6)QIHHQPw#Cty6&sS=4C5SBe mXnjqD?MIdY12YI6kUcrG`FQFFv%SEeV(@hJb6Mw<&;$TJkb|E9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json new file mode 100644 index 00000000000..8e6c837d4c0 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..21dab08af1de980276bb0169c5548b6541ce00e3 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnE zPZ!6KiaBp*?e#k1AkunXPt2|{AyJuQQ)|ReA+ddpT>Bb-G)LUtv8#1!>n}DjGrOj# zIucAx+*;aNZ4De@(#8i5NC=f2>f12qvni)}i}6nnwWE8J72KH|`dAv~L@`AbuU!(s zy~~kVxnpv}(w{G%lo|BhJ$Lfs;mh7Lt}jgU$K-_v>Gv#;O8J@00{ zS6LvwS6Qy+fK83Wod>TTeMv|xOjX`1a_pjX)mg@xNzbQ04Y^u>*wf+rKhw?CTQ*Ot zW%_&kxtmPsq|@&|+x?mJJpAdElk2y#&uG`RmUsOk&R{9TP^7}}#Dn3)M1~2t-Fd6JK{n$&_W|Q)Tjihm911Wy_bP0l+XkKB+bf& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..21dab08af1de980276bb0169c5548b6541ce00e3 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnE zPZ!6KiaBp*?e#k1AkunXPt2|{AyJuQQ)|ReA+ddpT>Bb-G)LUtv8#1!>n}DjGrOj# zIucAx+*;aNZ4De@(#8i5NC=f2>f12qvni)}i}6nnwWE8J72KH|`dAv~L@`AbuU!(s zy~~kVxnpv}(w{G%lo|BhJ$Lfs;mh7Lt}jgU$K-_v>Gv#;O8J@00{ zS6LvwS6Qy+fK83Wod>TTeMv|xOjX`1a_pjX)mg@xNzbQ04Y^u>*wf+rKhw?CTQ*Ot zW%_&kxtmPsq|@&|+x?mJJpAdElk2y#&uG`RmUsOk&R{9TP^7}}#Dn3)M1~2t-Fd6JK{n$&_W|Q)Tjihm911Wy_bP0l+XkKB+bf& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet-down.png new file mode 100644 index 0000000000000000000000000000000000000000..de8c613053c3d6907ae2db008851677809e2edd4 GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn1 zPZ!6KiaBp*?e{tyAktpXE6Xx{(b}XycE<^PM_uC=HTf%a?b@=qOXFPAqOyVuj_m&* zFpHE3&R?Jxv_XW0J4)-88H-E7gd=geUK>O9cqU7q`#G(p+9~hd@w1)}Wb``@Go|S9 zef$3IY4Lf()rGq|e*fOJYw_Vz)v<5<-Zw0p_AT}KbRmOh?|amWIwE^-A6@_A;-V<0 zu#2ygX8rpndY<_lXNKv@_9l0k&%BR%kJTRzWt!vQClz9BI>MTH+i4yr$-glHb#3x_)<@Ca{RpWU9432(s~EW(^X~R z&v`z_1V28O`cy{mND$wO*fr7Od51g&jwCWF@NqK~Mlb-K?jR$^@Mr^rKs#%Lg$@If zl(MdZjf8<+4dasFm)o>DI%X{m*ACG>QSTbn5Gg-LM%GBk{ClpVqs{5ki&43kiZXRp zv)poOs$dJ;x-DwP);Y{t(QB6qojH0s?{`#=s$=k>o1vc$yb+I>IqODabIzQ3`dy1( zc;1-Pdn0Pkfp6gpR%owyE3UzBsr4Wwd*`jm3eUE6=Q7&=W_@7r==J3@^IDeuVgFO! m?_m7=vAiOtTQR)xljYm7t1da4dN%?S1%s!npUXO@geCxTBl1%K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..ec0676a446bf5b334c116b9dbf6b28878db99eee GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn0 zPZ!6KiaBp*ZS*=EAkpgI-K@W0!GdOmDI7;nPA~W%C{n{L=rZT-mgddPc1_LQ{SQ=F zogFtUSi0zHz=WpYr2ko}$F3CJc9~GTPxWEjAM@|O^JhOyVS3_mK*PK;Ro|=cXXyTh z`i{vBTc5VRP@8ik?&*^s{~oTqCO?1nOue`Hxh~yD&F944eWrHk+5ffwHoVTX;9SAJ zKBHas#-r?irh4c7`NP7lZ{IyV>+J*9uSp#?8-M10pZP-N+Kj3TMeAOwEU3Ev>Za|j zyKnxo%<4VvWWB;geExIaC*5c5rNtJTT)Z|TZSm7RzukWEZ#cSa?tj+E?rYHuPdpe- zOk|j#%&6eby{aa)gzB~08R`*`C{)#G)g?2$>D zB`2eQi5-=GeC*>nrb!>SxL$KJGJDS_tK@8#^{?mAZ(f5noa=TU_H?MM)2i~TVZYFS zrne%euV-T`Z^xtkED^$QBp;tQ>6y5XUqZzHx$M;CSN-*_nOa>Z)@kRgn^{g5z7+oT Q2pFjhp00i_>zopr0F-XxR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1clear.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff6debe7a9bc62e99d7cc0566d0bca0ee6979a0b GIT binary patch literal 460 zcmV;-0WSbe&E3_n{hMrlQ} z5F2x%Y0i~2GVXQP)aIsxh~S<#&*eV%ob&VCYXSZ^C;$bZ02JVV0Q4?{GhxH@&KH*TLJ;u1d$4W5>bI-k%2zn5avuh zgy?j;=c{t=B_`G>mTs+s0aBS!gtyvAnS= z|ETq7I#^xLiS4HXxHA{3dsVzH?Uvz59fzK6*`RAGULPDD2Y``q<_n09AE~!&ocRh! zphkwfh&{s3*+f8qL9F(5E%*q_H1Jg>8*c=#tr<%2(G*a@s7I!Q6t5xfC(n#kE&p#A zg-Gs`!b=}Ap2-gofk^J zGAldJTp(=ZwDWt8R2*mdGZi1P_j4O$I2kO37>cSmXT+Yrb@*1%Mwy2kooxb?YutvM{Ub=&X w#5rySW9RcKJVhM;zV{rMQ2C3Cpxyfzk33l=K0T0w4;Uj1p00i_>zopr0Fvag%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..6ae31718660103a0a0711d6d3678cda3be38e6f7 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5B zr;B4q#hkaZ4tgDS5OK}#?q0(Z-n3)o1z+(;^M45c3jfRb-(}Z}WeE;TU5^9_c!qV> zGAldJTp(=ZwDWt8R2*mdGZi1P_j4O$I2kO37>cSmXT+Yrb@*1%Mwy2kooxb?YutvM{Ub=&X w#5rySW9RcKJVhM;zV{rMQ2C3Cpxyfzk33l=K0T0w4;Uj1p00i_>zopr0Fvag%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/helmet-down.png new file mode 100644 index 0000000000000000000000000000000000000000..bd031360633b25030ad02558ae2a340f7053e6b5 GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vnl zPZ!6KiaBp*Ic6OS5NNA!?(R@n7TR@5OlL=-;@vMYds|{(G~Q~BJ5*c}9J52y zxa{tX{3CMA!p8Yk>ecm{jNwabcH29-o38Ud$#H9)d223<^v1{!`#P*0ikQBgeNZ_` zFgo44=Jv$;ofpqNwVib1*BRMXB=s z_tu_k1qN?ABSIP;^z56KF>68{>mse$ovR8n7B*=7JX%*Hqv^7eZH?OOYe$lIa5P!y zFdRu_RN&)gD2!m}ILzcABgXJ(0|U_c4M>aH=iWqn>I(`4KM%T<*w(Z65`KQjmxvBQk z;l)!4A?f`>caLxht8FZv@5l6PePL#KO=aMmhg5TH=*-W&pC=x$&T%`|1B@^RPgg&ebxsLQ0QWk|SpWb4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ed68ebc4f4097756591a61b0826b065ccaa96d7b GIT binary patch literal 456 zcmV;(0XP1MP)b*Hwt{V?4}}VX1kd18Pm*KxBz^J> zK3FKULa?PVR5USSjA@!#-837FCPFEN9SF0T*_r>_+2joV*f;SSG#%g|L66;hhB@xTL@ zi7D4j;w91Y2bvK=9Q+2}G!1U=+OYP%g0~Gg&gw^Gy(V5P6hIV~8k2RURtL*8nOcmU*DK-p(K|cg)K@^w(8usT z)|rp6d2^{E;MVr%4Sjov+4PfKWnB0uz;$30uhg8-g7d*ZyN{T033h=aDZ<#`?>!!r{3BC0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json new file mode 100644 index 00000000000..f5934d5e093 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1dark.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..13aa5a9ee7c73caa492fd8872f37ec285edf0cbd GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R4) zr;B4q#hkaZHhLWnkZAQ+bUtu4ut1Z8@94ry2h|I{sD4@dOQ_GT(RpKYiGWTd7hlqw zB_|ca{vVj?z0)!Ogy<>D`;!WsExy-z=C%Dl@6gB6Aj8REIhVypO?~#;jW^%aHOQ)X z9XR^4;`5hZjZceA*S`LhZgc*#+o^+fZLeon8VTy%FWOf4c;nANrg`!A0@vM7=w83- zlvwT0zfYEzt<|}H!tVP7q3QCcGNu3bYA|ju=kLAy@WY0mEN`}!KX=_ICF0S2I{);` zN%u4PHymv{S1$OM73KyZh9VV)CmswZCNfM=W>j!zLX&WK!yC3}+v51PZ@*cCzH@F# zZGHAtd=YCz=Pmv(zggF$%$s%e(MHYVzim1H?Mdnsd*F2?efja;28aCzM1_o`WLc|) z?(9i=xrhBnW8HoRq08m|PWrPS)PLvrGIRNUoR-2Qo^uztE}hu3W3B=)Vi-JK{an^L HB{Ts5mbJf= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..13aa5a9ee7c73caa492fd8872f37ec285edf0cbd GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R4) zr;B4q#hkaZHhLWnkZAQ+bUtu4ut1Z8@94ry2h|I{sD4@dOQ_GT(RpKYiGWTd7hlqw zB_|ca{vVj?z0)!Ogy<>D`;!WsExy-z=C%Dl@6gB6Aj8REIhVypO?~#;jW^%aHOQ)X z9XR^4;`5hZjZceA*S`LhZgc*#+o^+fZLeon8VTy%FWOf4c;nANrg`!A0@vM7=w83- zlvwT0zfYEzt<|}H!tVP7q3QCcGNu3bYA|ju=kLAy@WY0mEN`}!KX=_ICF0S2I{);` zN%u4PHymv{S1$OM73KyZh9VV)CmswZCNfM=W>j!zLX&WK!yC3}+v51PZ@*cCzH@F# zZGHAtd=YCz=Pmv(zggF$%$s%e(MHYVzim1H?Mdnsd*F2?efja;28aCzM1_o`WLc|) z?(9i=xrhBnW8HoRq08m|PWrPS)PLvrGIRNUoR-2Qo^uztE}hu3W3B=)Vi-JK{an^L HB{Ts5mbJf= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1darkalt.rsi/helmet-down.png new file mode 100644 index 0000000000000000000000000000000000000000..d251959d8d96fe10811490de392320309688dd6d GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vm) zPZ!6KiaBp*9rR)f6ltqZ<~VwFi{vF0fo6rwz#T6*qrM4k+rYl6bzjTrc?(*vEHZO6 zl0H4-RLo6}j>+yb97WbzU-xV;-glO#_(=8n<9o~5&KVw%5nS-;@tMBTn{{P+hmMsl z{C_?#dg_^LZ?@c?&%9@kRrspM+MF7)DcWCIng57gPrYuW?YEpedB(iX(p`HCZGsqA zKYRAg&@sH)ujbxo*CSpIA{v|(zkfKbEO}u%du`PI`~36NCwq!;?KC?2xNQh^e_+s1Pl`M1in8)q!s!>Zvq$>ICrC(XYt)cjklnAIltW z+BDzgwZIqE8OtKS{$`E2ZtLE%Bxt2p>`HY<^Gc`Rx(`aKXS@>c2yxiBL;Q=%g&Vsv zxM#c*cQ~T6TRl7n;RGG7}V$K8kN2(8AeOgmf z_4`QG-kIXAAFFNp9($d-nAmcA_tOleHUHv2zn9KG?0w+$YxYfVt#dwC&bz&AeZ7_a z_KiBXm3~1A5ip?R?EAi#$&Hx;AchMt0BI zgXQPq{xg1cs_o)a+>&vZ)uE52L57pTQi!2Qh2e<@!-Fe$Jl0i@cXL| zLIs6&L3ZZzm|{6L(8azT?dTj4uXHS3j3^P6GFc8Kse+H7$7ARqBh7KUa&@xqmiIF#8;^CNh z14gDI*jfpMSTdv=Pyua8hLRZHH7+4?X&MP3B%h^R;+((l=Zj;)ABO@^017|>{11Re zqt2EQb=^8;-|vIx^|itP!noPoS;ilFy@xai`w3z$0GbQq&h;&58fk=i01n!FmH=4< zAq6-(Y_avV5_Gx1IGm7q6h)&v=7wRIS2uTIX~nc!yDq%EzJpV>z}eqswr#^@r~3^= z3V`OT<;v`tn`0_-abSFCe26Ry-OwqgHH7Zz$uT=SznCqQ0wA?4uoH|i%DSfG1h6=k zRnm1l8j@BJ1TZh80N5rx1Ga6^C%~O!7toyKbq#9O65T&@gOACy=4gAm)!&8;Aqp2tnzR)k185ynvr&PLhF>fj;t@^(Nh5M4ls zBuE&|acB6S<2^#8-)CzI{f23X?0i-@PfZ~J0U?=Nx~4F|Z-)X<017|>D1cAgKd}B+ SwQ|b<0000QY#)pOFyUiZ_FY1vEhX*bQ!96ml- z;^CU|>9XtHp4~F~d&K0-gULqw^_H*P$F0uz_~!9r@0732ci7a?Tvs*2{i1i_KRJ~T z-ZSq{xvaMTs$7EHws$r17vsUsn8+|enNh)=$)S&>L57pTQV8ZgB#9mO5~8j=%hw-w1be;B^AuG}O0 SQcoQiM+}~>elF{r5}E*qV8BHH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..56470b61d443c890ca4f2d8c3d83a464d0d9ff21 GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5T zr;B4q#hkaZHhLWnkZAR9a=!1N5$00xQX$XpUEaQy{tL%1m=~0le>QY#)pOFyUiZ_FY1vEhX*bQ!96ml- z;^CU|>9XtHp4~F~d&K0-gULqw^_H*P$F0uz_~!9r@0732ci7a?Tvs*2{i1i_KRJ~T z-ZSq{xvaMTs$7EHws$r17vsUsn8+|enNh)=$)S&>L57pTQV8ZgB#9mO5~8j=%hw-w1be;B^AuG}O0 SQcoQiM+}~>elF{r5}E*qV8BHH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet-down.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/helmet-down.png new file mode 100644 index 0000000000000000000000000000000000000000..073862186af4fdf1f8007627fc1517ce6aa5f3f9 GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vo0 zPZ!6KiaBp*ZS-a;6gj?Mj?bxkic*Iai!R?KA>UkI-M_q!0^79y3MP6x>z;k<i^!={`mRs!CsAy!%Qjr=A2t{ zPUrL23;8jkAAf&*I`z@4Yx6s7tqs4tdAIY;zaSFJesd#MVwSPs zYs>fXh1?u|2llKqzb#m}b=i^SYyZ2gU}0&T!f?3GdEbQc?cdB#>uxrUI-j;_$L@+1 z5@phf&Rz``O_}b+uAi!$+pqP6&WYKtlhn+_a#}|2qJiRHafy(d9C{D=>|amZGPfvu z>+*+H93MlOk4@&yek2#e;wU4=@Mr^rKs#%Lg$~1!L`DTZZid1L2B04tkfbg#aqV34 zThM<|V7^X>v&$Eq#e2W4X#Nwvgtg-D!Mk5Ww?|zTcWT-({dnL0drRJ5o3T(8#AUy@ z_1ogx+a~d!6K- zGM`D-{qT=H2NE;`81>DsWvDs6S=+U#Vg6?(4vCLnWfRwsq$yS_s{2l=dzi*E4VX#+o>tj;##UBuD!=jQu|}Ky+dEJG zKE1F`cT>2}ADP^w&$r(hUkqJiI9aE3-Ak1O8{hqJ?mhmjKH*IA`q^_u7GHe)>d#H@ z3wmbt=HI)mE?%3FGSBM$zP=&Klmr4U1r3d0i*h7%JRCMYuk9qG`= z(jdc$Dsg#5!`B;oUhdel_7*$$29H~PuQ%>gJub00P^XpeP=a!oIbZMNxvU|NGrQOH zX65XY+U43DaaQ7EzsA4ajBTa|OUo@dCBF1`Pd`=8keZUW=IFBwiRc^CH1>%k_-;tQ zQ?X3;&DYuk+bVXwU9o3fUFpVk7kA!c!r>HjH`*~UygYF5m56^1Fd7*=UHx3vIVCg! E0FU<8TL1t6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9342a2f5f6aef34cdc2dd4a8496cb2bcb2eb19ab GIT binary patch literal 457 zcmV;)0XF`LP)?T{1&@@d!MA*4}!_LmkFSCoG@BQQf#gAC0+2*fKoAa~dRRh@ zhpQz-r`=hZGtx#>RYmQU@jhZTh#de8gh*WVkX% ziu7J?!y|r8#BN(>RK-0f7~uI5V(ku$F^0?Q8|oYH9tgg)jG2~2RhA_9tXPm|FNQ6z>GBVT4G`e zZQVr#FtpY2xgLImX}r;=OgGL2u*?NX2*?!dzKh~9HXWiAqz@>aAHOrv^y0r^93p+r z3P*9+@J?}n7)1K4@SUvze%m+z2jBo4fCKyh+}FO4ydfIS00000NkvXXu0mjf!ym=< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json new file mode 100644 index 00000000000..dc65d33f716 --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Goggles/m1a1green.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/9c26d36fdcba53dc47dd2007d4532bf9806c9e79/icons/mob/humans/onmob/helmet_garb.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "helmet-down", + "directions": 4 + }, + { + "name": "helmet", + "directions": 4 + } + ] +} \ No newline at end of file From bc49a8b44a75860b5d7c46199a6131267a29d583 Mon Sep 17 00:00:00 2001 From: Orion <58231741+troytroy400@users.noreply.github.com> Date: Thu, 27 Mar 2025 22:42:16 -0700 Subject: [PATCH 06/21] Merge pull request #47 from troytroy400/glasses Port PvE Glasses --- .../_AU14/Entities/Clothing/glasses.yml | 47 ++++++++++++++++++ .../Glasses/bimex.rsi/equipped-EYES.png | Bin 0 -> 412 bytes .../Glasses/bimex.rsi/equipped-MASK.png | Bin 0 -> 412 bytes .../_AU14/Clothing/Glasses/bimex.rsi/icon.png | Bin 0 -> 292 bytes .../Clothing/Glasses/bimex.rsi/meta.json | 22 ++++++++ .../Glasses/orangebimex.rsi/equipped-EYES.png | Bin 0 -> 386 bytes .../Glasses/orangebimex.rsi/equipped-MASK.png | Bin 0 -> 386 bytes .../Clothing/Glasses/orangebimex.rsi/icon.png | Bin 0 -> 307 bytes .../Glasses/orangebimex.rsi/meta.json | 22 ++++++++ .../equipped-EYES.png | Bin 0 -> 374 bytes .../equipped-MASK.png | Bin 0 -> 374 bytes .../Glasses/orangepersonalshades.rsi/icon.png | Bin 0 -> 353 bytes .../orangepersonalshades.rsi/meta.json | 22 ++++++++ 13 files changed, 113 insertions(+) create mode 100644 Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/icon.png create mode 100644 Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/meta.json diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml b/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml new file mode 100644 index 00000000000..91adb82a680 --- /dev/null +++ b/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml @@ -0,0 +1,47 @@ +- type: entity + parent: ClothingEyesBase + id: AU14GlassesBiMex + name: BiMex Ballistic Glasses + description: A pair of black tinted shooting glasses. USCM issue. + components: + - type: Item + storedRotation: 0 + - type: Sprite + sprite: _AU14/Clothing/Glasses/bimex.rsi + - type: Clothing + sprite: _AU14/Clothing/Glasses/bimex.rsi + slots: + - EYES + - MASK + +- type: entity + parent: ClothingEyesBase + id: AU14GlassesBiMexOrange + name: Orange BiMex Ballistic Glasses + description: A pair of orange tinted shooting glasses. USCM issue. + components: + - type: Item + storedRotation: 0 + - type: Sprite + sprite: _AU14/Clothing/Glasses/orangebimex.rsi + - type: Clothing + sprite: _AU14/Clothing/Glasses/orangebimex.rsi + slots: + - EYES + - MASK + +- type: entity + parent: RMCSunglasses + id: AU14GlassesPersonalOrange + name: orange personal shades + description: These are an expensive pair of sunglasses. This brand is popular with UA foot sloggers because its patented mirror refraction has been said to offer protection from atomic flash, solar radiation, and targeting lasers. To top it all off, everyone seems to know a guy who knows a guy who knows a guy that had a laser pistol reflect off of his shades. + components: + - type: Item + storedRotation: 0 + - type: Sprite + sprite: _AU14/Clothing/Glasses/orangepersonalshades.rsi + - type: Clothing + sprite: _AU14/Clothing/Glasses/orangepersonalshades.rsi + slots: + - MASK + - EYES \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..ffb6705bba27a6970ae2acd7eec1e6f05b21e97b GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR< zr;B4q#hkad480FKFdY3TUdZ7zEg?*>yIH}4L$8kQ;8FjVN*3jUn^;shnwmp$ChANS zv7C^Tt}pR2pkw+Zo%eqgw#c+R`KK89uFTPo(E*HV{5u}sIQG%b&+q()8A~np?>KV$ zv+$}{#ib#PY|~Uabx#}pcwZs@o?-vwEtT^YYIG&2pMSI6aIw$5m9KAQ@9|zAe!#b^ z)a1YYv(JHQ_l%CQ*gcN@!pmUEN+i1REM>de`?|ZAz8p+xT6{S9&i%W5yP|4JYm@Ka zi{CiotUz0$@wN1Lht=f`8eRX)RCWl&pH{teRK(d^e%X!gMQNYje!aW5XP?c!x`Vm% t8rFZ^%Q^eq(dqjb6_zvLL+|Tmom~I` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..ffb6705bba27a6970ae2acd7eec1e6f05b21e97b GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR< zr;B4q#hkad480FKFdY3TUdZ7zEg?*>yIH}4L$8kQ;8FjVN*3jUn^;shnwmp$ChANS zv7C^Tt}pR2pkw+Zo%eqgw#c+R`KK89uFTPo(E*HV{5u}sIQG%b&+q()8A~np?>KV$ zv+$}{#ib#PY|~Uabx#}pcwZs@o?-vwEtT^YYIG&2pMSI6aIw$5m9KAQ@9|zAe!#b^ z)a1YYv(JHQ_l%CQ*gcN@!pmUEN+i1REM>de`?|ZAz8p+xT6{S9&i%W5yP|4JYm@Ka zi{CiotUz0$@wN1Lht=f`8eRX)RCWl&pH{teRK(d^e%X!gMQNYje!aW5XP?c!x`Vm% t8rFZ^%Q^eq(dqjb6_zvLL+|Tmom~I` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e2dae520779ec096bd0b6cc56c4725342ac17d GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0t1& z#WAE}&f6)De9a01uBMqviHS_!e1}vm)=&SSl6Pcop}TeOBuBTX+a_g(_0QAO{s}W} zf0bm&z-$0UfAkxs7`@qBIq&tQU;CaVGf2FfbNbJ|_sJ`^PLsJ&dUvxMhv44SNWO!7 z55XcVoENs~@~qf$O@HBr1?*MwrI7+H!2&7=tQ7Lh*%lr! ztCw*%l5u{s_mZHBzye(dP0=31&i*RDl@+`f4>aswp1ErFGESGfnR~zT1u))knaB2H isYC-K5b3e+VAhw;-hStW%`2b}89ZJ6T-G@yGywp}(`|47 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json new file mode 100644 index 00000000000..3d3d7637a7e --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Glasses/bimex.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..162253516c9855e2a40a08083bfcd3a5d25aa8bd GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRp zr;B4q#hkadHu@fRkZ5~&U8q%h`n*Q2wgp@_m4q)SN@+<&sU-#r2sP1gAxr#Go&l!UCckEQjU-z(#yZrozPYm+!FUTa+ zFG)x&jeWi?w|oD({+TilswY?esJ&Gam;HI+>s_9&lhgjPCT(8s|NdX@++O}5ucK4G z8rHExjO!?7IAY20NQR-1ufc*HZVQs|hxy%)eeCu<&iGY0`Pa`-)Ys(iIe)OxmyTd+O-689C+D?Wngo{p$GR{rM97oAM)%Rth|> kIlOZ=KOvhZ^M7F7@HfJE-#r2sP1gAxr#Go&l!UCckEQjU-z(#yZrozPYm+!FUTa+ zFG)x&jeWi?w|oD({+TilswY?esJ&Gam;HI+>s_9&lhgjPCT(8s|NdX@++O}5ucK4G z8rHExjO!?7IAY20NQR-1ufc*HZVQs|hxy%)eeCu<&iGY0`Pa`-)Ys(iIe)OxmyTd+O-689C+D?Wngo{p$GR{rM97oAM)%Rth|> kIlOZ=KOvhZ^M7F7@HfJE zKXJo_mh--MCOqfHp00i_>zopr0E7>H AUjP6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json new file mode 100644 index 00000000000..61eaaa03b4b --- /dev/null +++ b/Resources/Textures/_AU14/Clothing/Glasses/orangebimex.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13-pve at https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/obj/items/clothing/glasses.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi, https://github.com/cmss13-devs/cmss13-pve/blob/3a8fe887279b11a6de4dfef2ffb58779e2a26876/icons/mob/humans/onmob/eyes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-EYES.png b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..117272bc90e47adda56388747dacb20f90734d62 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRm zr;B4q#hkadHs&63kZ5~&J?Phz%!v^UK|ui(>}nqUQy5nmIjH>dnIIbzu!Kclpwmp$ zpz&h9!6FBvvLmMVzng6H-*oP~SJ~rgr#Z|D=NJW^GsNcqi0oNq!N;z;|MtaHn|1N` zPE>5LIlp?5#-{4yw@dg8erjy)5a`Z7muz$N(c!x7uTAbPyRI$3y}xwcp{mU%clB)l zXwFc`*I>c!05h_qnBj;e!y_3C;fDWr{@BgGzW-SI`PILyj>EX`~Uy| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-MASK.png b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..117272bc90e47adda56388747dacb20f90734d62 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRm zr;B4q#hkadHs&63kZ5~&J?Phz%!v^UK|ui(>}nqUQy5nmIjH>dnIIbzu!Kclpwmp$ zpz&h9!6FBvvLmMVzng6H-*oP~SJ~rgr#Z|D=NJW^GsNcqi0oNq!N;z;|MtaHn|1N` zPE>5LIlp?5#-{4yw@dg8erjy)5a`Z7muz$N(c!x7uTAbPyRI$3y}xwcp{mU%clB)l zXwFc`*I>c!05h_qnBj;e!y_3C;fDWr{@BgGzW-SI`PILyj>EX`~Uy| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/icon.png b/Resources/Textures/_AU14/Clothing/Glasses/orangepersonalshades.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..13361bfb46d742a792af64485751bab3be546e93 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq_xj z)5S5QV$RzshI~y90XHOgJ+SYjoPF=b&Ln0|D zkwNgUN^)4r!GsPmg8u6!%u0)S7I^-1Ry;SuzIptvzfC@G zw3pkJ9&aLb(KIV_SDE8A5yu9e>?es5Qq1Yo@B9r>Drah7?lC>c$;K(^SAJ~ot{FP{ z`Imz^pK=9U&*TUVb4!h!RuKE0Gt^f#+~M6Uu4KRYi*vT#RKLsorGfkQw&Y0;(^MCV z960!|L|Wf%?({hd{dXo9iyYLPuI`Y(%yOsjf!0RlN%@?DJDr~tEn^Z1eOTWhrz&{s ubW!R7dF~~yU7Jp^tkM!oU=&Mew0>E!E-r6#-alZNF?hQAxvX Date: Wed, 20 May 2026 19:22:17 -0600 Subject: [PATCH 07/21] rmc weapons --- Content.Shared/.CM14/Xenos/XenoComponent.cs | 2 +- .../Weapons/Ranged/Systems/SharedGunSystem.cs | 13 + .../Ranged/GunDamageModifierComponent.cs | 13 + .../Ranged/AssistedReloadCompatComponents.cs | 11 + .../Weapons/Guns/Breech/attributions.yml | 10 - .../_RMC14/Weapons/Guns/Cock/attributions.yml | 5 - .../Weapons/Guns/Gunshots/attributions.yml | 122 +------ .../Weapons/Guns/Gunshots/rsh9_fire.ogg | Bin 11600 -> 8513 bytes .../Weapons/Guns/Reload/attributions.yml | 35 +- .../_RMC14/Weapons/Guns/attributions.yml | 9 +- .../Audio/_RMC14/Weapons/attributions.yml | 35 -- .../Entities/Clothing/Armor/marinearmor.yml | 22 +- .../_AU14/Entities/Clothing/glasses.yml | 2 +- .../_AU14/Entities/Clothing/goggles.yml | 27 +- .../_CM14/Audio/xeno_sound_collections.yml | 2 +- .../entrenching_tool_sound_collections.yml | 13 + .../Audio/explosion_sound_collections.yml | 30 ++ .../_RMC14/Audio/food_sound_collections.yml | 5 + .../_RMC14/Audio/gun_sound_collections.yml | 38 +++ .../_RMC14/Audio/hijack_sound_collections.yml | 6 + .../Audio/medical_sound_collections.yml | 4 + .../Audio/round_end_sound_collections.yml | 29 ++ .../Audio/telephone_sound_collections.yml | 10 + .../_RMC14/Audio/xeno_sound_collections.yml | 69 ++++ .../Weapons/Explosives/breaching_charge.yml | 38 +++ .../Objects/Weapons/Guns/LMGs/base_lmg.yml | 103 ++++++ .../Objects/Weapons/Guns/LMGs/m60_lmg.yml | 166 +++++++++ .../Guns/Launchers/base_grenade_launcher.yml | 67 ++++ .../Guns/Launchers/m5_atl_rocket_launcher.yml | 215 ++++++++++++ .../Guns/Launchers/m79_grenade_launcher.yml | 48 +++ .../Guns/Launchers/m83_grenade_launcher.yml | 42 +++ .../Guns/Launchers/m86_riot_launcher.yml | 31 ++ .../Objects/Weapons/Guns/Pistols/b92fs.yml | 81 +++++ .../Weapons/Guns/Pistols/base_pistol.yml | 136 ++++++++ .../Weapons/Guns/Pistols/holdout_pistol.yml | 111 ++++++ .../Weapons/Guns/Pistols/hummingbird.yml | 89 +++++ .../Weapons/Guns/Pistols/m1984_pistol.yml | 109 ++++++ .../Weapons/Guns/Pistols/m77_pistol.yml | 147 ++++++++ .../Weapons/Guns/Pistols/mk45_pistol.yml | 130 +++++++ .../Weapons/Guns/Pistols/mk80_pistol.yml | 143 ++++++++ .../Weapons/Guns/Pistols/su6_pistol.yml | 119 +++++++ .../Weapons/Guns/Revolvers/base_revolver.yml | 64 ++++ .../Weapons/Guns/Revolvers/m44_revolver.yml | 190 +++++++++++ .../Objects/Weapons/Guns/Revolvers/mateba.yml | 140 ++++++++ .../Objects/Weapons/Guns/Revolvers/rs9.yml | 132 ++++++++ .../Weapons/Guns/Rifles/ar10_rifle.yml | 162 +++++++++ .../Weapons/Guns/Rifles/base_rifle.yml | 109 ++++++ .../Objects/Weapons/Guns/Rifles/m16_rifle.yml | 132 ++++++++ .../Weapons/Guns/Rifles/m4spr_rifle.yml | 203 +++++++++++ .../Weapons/Guns/Rifles/m4spr_scout_rifle.yml | 301 ++++++++++++++++ .../Weapons/Guns/Rifles/m54c_heavy_rifle.yml | 147 ++++++++ .../Weapons/Guns/Rifles/m54c_rifle.yml | 259 ++++++++++++++ .../Guns/Rifles/m59a_prototype_rifle.yml | 126 +++++++ .../Weapons/Guns/Rifles/rifle_handfuls.yml | 39 +++ .../Weapons/Guns/Rifles/xm88_rifle.yml | 155 +++++++++ .../Objects/Weapons/Guns/SMGs/base_smg.yml | 61 ++++ .../Objects/Weapons/Guns/SMGs/m63_smg.yml | 256 ++++++++++++++ .../Objects/Weapons/Guns/SMGs/mp5_smg.yml | 146 ++++++++ .../Objects/Weapons/Guns/SMGs/nailgun.yml | 131 +++++++ .../Weapons/Guns/Shotguns/base_shotgun.yml | 131 +++++++ .../Weapons/Guns/Shotguns/custombuilt.yml | 61 ++++ .../Guns/Shotguns/m357_sawn_off_shotgun.yml | 49 +++ .../Weapons/Guns/Shotguns/m357_shotgun.yml | 62 ++++ .../Guns/Shotguns/m890_riotshotgun.yml | 59 ++++ .../Weapons/Guns/Shotguns/m890_shotgun.yml | 60 ++++ .../Weapons/Guns/Shotguns/mou53_shotgun.yml | 85 +++++ .../Weapons/Guns/Shotguns/pump_shotgun.yml | 69 ++++ .../Weapons/Guns/Shotguns/shotgun_boxes.yml | 180 ++++++++++ .../Guns/Shotguns/shotgun_handfuls.yml | 286 ++++++++++++++++ .../Weapons/Guns/Shotguns/shotgun_pellets.yml | 182 ++++++++++ .../Weapons/Guns/Shotguns/xm51_shotgun.yml | 106 ++++++ .../Weapons/Guns/SmartGuns/smart_gun.yml | 241 +++++++++++++ .../Weapons/Guns/Snipers/base_sniper.yml | 55 +++ .../Weapons/Guns/Snipers/m96s_sniper.yml | 237 +++++++++++++ .../Objects/Weapons/Guns/cm_base_gun.yml | 38 +++ .../Objects/Weapons/Melee/fireaxe.yml | 25 ++ .../Entities/Objects/Weapons/Melee/flash.yml | 32 ++ .../Objects/Weapons/Melee/kitchen.yml | 59 ++++ .../Entities/Objects/Weapons/Melee/knife.yml | 143 ++++++++ .../Objects/Weapons/Melee/pickaxe.yml | 30 ++ .../Objects/Weapons/Melee/stun_baton.yml | 23 ++ .../Objects/Weapons/Throwable/grenades.yml | 320 ++++++++++++++++++ .../Objects/Weapons/Throwable/packets.yml | 184 ++++++++++ .../Objects/Weapons/attachable_compat.yml | 7 + 84 files changed, 7524 insertions(+), 240 deletions(-) create mode 100644 Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs create mode 100644 Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs create mode 100644 Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml create mode 100644 Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml diff --git a/Content.Shared/.CM14/Xenos/XenoComponent.cs b/Content.Shared/.CM14/Xenos/XenoComponent.cs index 8955463c2f8..4f07b840901 100644 --- a/Content.Shared/.CM14/Xenos/XenoComponent.cs +++ b/Content.Shared/.CM14/Xenos/XenoComponent.cs @@ -84,7 +84,7 @@ public sealed partial class XenoComponent : Component [DataField] [ViewVariables(VVAccess.ReadWrite)] - public SoundSpecifier TailHitSound = new SoundCollectionSpecifier("XenoTailSwipe"); + public SoundSpecifier TailHitSound = new SoundCollectionSpecifier("CM14XenoTailSwipe"); [DataField] [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 91837f26799..63ce20b7c07 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -31,6 +31,7 @@ using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Whitelist; +using Content.Shared._CM14.Weapons.Ranged; using Content.Shared._RMC14.Weapons.Ranged.Prediction; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; @@ -117,6 +118,7 @@ public override void Initialize() SubscribeLocalEvent(OnCycleMode); SubscribeLocalEvent(OnGunSelected); SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnGunDamageModifierAmmoShot); _physQuery = GetEntityQuery(); // Mono _projQuery = GetEntityQuery(); // Mono @@ -146,6 +148,17 @@ private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent arg } } + private void OnGunDamageModifierAmmoShot(Entity ent, ref AmmoShotEvent args) + { + foreach (var projectile in args.FiredProjectiles) + { + if (!_projQuery.TryGetComponent(projectile, out var comp)) + continue; + + comp.Damage *= ent.Comp.Multiplier; + } + } + private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args) { // Goobstation start: Multishot; Ensures that guns shoot at same time. // HardLight: Fixed typo diff --git a/Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs b/Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs new file mode 100644 index 00000000000..34f9d00a9c1 --- /dev/null +++ b/Content.Shared/_CM14/Weapons/Ranged/GunDamageModifierComponent.cs @@ -0,0 +1,13 @@ +using Content.Shared.FixedPoint; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.GameStates; + +namespace Content.Shared._CM14.Weapons.Ranged; + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(SharedGunSystem))] +public sealed partial class GunDamageModifierComponent : Component +{ + [DataField, AutoNetworkedField] + public FixedPoint2 Multiplier; +} diff --git a/Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs b/Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs new file mode 100644 index 00000000000..db5797009ac --- /dev/null +++ b/Content.Shared/_RMC14/Weapons/Ranged/AssistedReloadCompatComponents.cs @@ -0,0 +1,11 @@ +namespace Content.Shared._RMC14.Weapons.Ranged; + +[RegisterComponent] +public sealed partial class AssistedReloadWeaponComponent : Component +{ +} + +[RegisterComponent] +public sealed partial class AssistedReloadAmmoComponent : Component +{ +} \ No newline at end of file diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml index 18c053eb3e4..580f900d818 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml +++ b/Resources/Audio/_RMC14/Weapons/Guns/Breech/attributions.yml @@ -7,13 +7,3 @@ license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/ugl_open.ogg" - -- files: ["pkd_open_chamber.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/pkd_open_chamber.ogg" - -- files: ["pkd_close_chamber.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/pkd_close_chamber.ogg" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml index ab3037cc485..d6eb85fd6e7 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml +++ b/Resources/Audio/_RMC14/Weapons/Guns/Cock/attributions.yml @@ -1,8 +1,3 @@ -- files: ["gun_cocked2.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/gun_cocked2.ogg" - - files: ["gun_pistol_cocked.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml index efb6a8b5156..5a869bd8a99 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/attributions.yml @@ -8,11 +8,6 @@ copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/41a9b4198368b478eb611f74e810142d2761aa10/sound/weapons/gun_boomslang_fire.ogg" -- files: ["gun_es4.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/gun_es4.ogg" - - files: ["gun_m1984_1.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" @@ -93,11 +88,6 @@ copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/gun_sniper.ogg" -- files: [ "gun_sniper_heavy.ogg" ] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/sniper_heavy.ogg" - - files: ["gun_ugl.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" @@ -125,7 +115,8 @@ - files: ["gun_ml66a.ogg"] license: "CC-BY-4.0" - copyright: "Taken and modified from soundsnap/freesound, Pixabay usage terms at https://pixabay.com/service/terms/" + copyright: "Taken and modified from soundsnap/freesound, Pixabay usage terms at https://pixabay.com/service/terms/ +" source: "https://pixabay.com/sound-effects/battle-rifle-42734/" #, https://freesound.org/people/NoahBangs/sounds/607320/ - files: ["m5_shoot.ogg"] @@ -153,112 +144,3 @@ copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_m60.ogg" -- files: ["gun_DE50.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_DE50.ogg" - -- files: ["gun_mou53.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_mou53.ogg" - -- files: ["gun_mar40.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_mar40.ogg" - -- files: ["gun_m54c_1.ogg"] - license: "CC0-1.0" - copyright: "Taken and modified from freesound.org" - source: "https://freesound.org/people/SuperPhat/sounds/417686/" - -- files: ["gun_shotgun_small.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_small.ogg" - -- files: ["gun_cmb_1.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_cmb_1.ogg" - -- files: ["gun_cmb_rattle.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_cmb_rattle.ogg" - -- files: ["gun_cmb_2.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_cmb_2.ogg" - -- files: ["gun_ml66a_2.ogg"] - license: "CC0-1.0" - copyright: "Taken and modified from freesound.org" - source: "https://freesound.org/people/SuperPhat/sounds/417686/" - -- files: ["gun_shotgun_tactical_1.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_1.ogg" - -- files: ["gun_shotgun_tactical_2.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_2.ogg" - -- files: ["gun_shotgun_tactical_3.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_3.ogg" - -- files: ["gun_shotgun_tactical_4.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_shotgun_tactical_4.ogg" - -- files: ["gun_boltaction.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/32730c731936c6737668ead7bde83a6cf296010f/sound/weapons/gun_boltaction.ogg" - -- files: ["gun_ssg45_1.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/eb11a226994fb140fb0f713dd05525a0f8b3b3ae/sound/weapons/gun_nsg23_1.ogg" - -- files: ["gun_ssg45_2.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/eb11a226994fb140fb0f713dd05525a0f8b3b3ae/sound/weapons/gun_nsg23_2.ogg" - -- files: ["gun_type64.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/553029b58d42439bef45e30a593bdcf370d99f9a/sound/weapons/smg_heavy.ogg" - -- files: ["gun_type88.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/553029b58d42439bef45e30a593bdcf370d99f9a/sound/weapons/gun_mg.ogg" - -- files: ["gun_ak4047.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/48e570bd697f2476e28d89cd255d0539a5228228/sound/weapons/gun_ak4047.ogg" - -- files: ["p90_shot.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/789a362bc55d2d6331bc89699bb4f9f792695853/sound/weapons/p90.ogg" - -- files: ["gun_shotgun_heavy.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/789a362bc55d2d6331bc89699bb4f9f792695853/sound/weapons/gun_shotgun_heavy.ogg" - -- files: ["gun_kt42.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/8086109b2dbf8d1d98aec106a07d86b65fe63e1b/sound/weapons/gun_kt42.ogg" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg index bb0d7fecb2c396eb0d0ac5cf3a142e8b31ae94d3..649cf3778f8f45152961dc338f30c365c3771df5 100644 GIT binary patch literal 8513 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 diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml index 350c8c48e88..37a48fd1943 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml +++ b/Resources/Audio/_RMC14/Weapons/Guns/Reload/attributions.yml @@ -107,48 +107,25 @@ license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/7853d79df1827a2a4907fb3162b6319662dbc1ba/sound/weapons/handling/smg_unload.ogg" - + - files: ["shell_load1.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load1.ogg" - + - files: ["shell_load2.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load2.ogg" - + - files: ["shell_load3.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load3.ogg" - + - files: ["shell_load4.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/f2b3774f6ca9173e76e7783d88e3c2f765cd385f/sound/weapons/shell_load4.ogg" - -- files: ["gun_mou_reload.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/weapons/handling/gun_mou_reload.ogg" - -- files: ["gun_m16_reload.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/5db92c87812e21fa7f9343758e96f49ef1e01c3f/sound/weapons/handling/gun_m16_reload.ogg" - -- files: ["gun_m16_unload.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/5db92c87812e21fa7f9343758e96f49ef1e01c3f/sound/weapons/handling/gun_m16_unload.ogg" - -- files: ["gun_44mag_open_chamber.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/db16154cb71e98060169230d7902d776d9b522f9/sound/weapons/gun_44mag_open_chamber.wav" - -- files: ["gun_44mag_speed_loader.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/db16154cb71e98060169230d7902d776d9b522f9/sound/weapons/gun_44mag_speed_loader.wav" + + diff --git a/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml b/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml index 5baed38fe83..122b013dd58 100644 --- a/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml +++ b/Resources/Audio/_RMC14/Weapons/Guns/attributions.yml @@ -2,18 +2,13 @@ license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/a3b7bc4f4388bf291ccfeceac7d471961c224b45/sound/weapons/gun_rifle_draw.ogg" - + - files: ["gun_pistol_draw.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/a3b7bc4f4388bf291ccfeceac7d471961c224b45/sound/weapons/gun_pistol_draw.ogg" - + - files: ["gun_pistol_sheathe.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/a3b7bc4f4388bf291ccfeceac7d471961c224b45/sound/weapons/gun_pistol_sheathe.ogg" - -- files: ["gun_cmb_click1.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/21e6447cc08aea502f671c819fdbcecbb85e6028/sound/weapons/handling/gun_cmb_click1.ogg" diff --git a/Resources/Audio/_RMC14/Weapons/attributions.yml b/Resources/Audio/_RMC14/Weapons/attributions.yml index a3af32c75fb..b95e6e5f62e 100644 --- a/Resources/Audio/_RMC14/Weapons/attributions.yml +++ b/Resources/Audio/_RMC14/Weapons/attributions.yml @@ -3,11 +3,6 @@ copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/183b50b774c6faef054b6f67f57ff40ecc15409f/sound/weapons/alien_claw_swipe.ogg" -- files: ["alien_knockdown.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/183b50b774c6faef054b6f67f57ff40ecc15409f/sound/weapons/alien_knockdown.ogg" - - files: ["gun_mortar_fire.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" @@ -33,11 +28,6 @@ copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/5fc3c2ca34b8ebabe139555a33d56b65cfa2479b/sound/weapons/gun_orbital_travel.ogg" -- files: ["handcuffs.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/d5913ef37c373d523c9ea9f23ab8a4a534860e58/sound/weapons/handcuffs.ogg" - - files: ["pierce.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" @@ -52,28 +42,3 @@ license: "CC-BY-SA-3.0" copyright: "Taken from cmss13" source: "https://github.com/cmss13-devs/cmss13/blob/21e6447cc08aea502f671c819fdbcecbb85e6028/sound/weapons/unload.ogg" - -- files: ["synthpunch1.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/49db80ef5770796bda9056a5e5be54b5eb02d060/sound/weapons/synthpunch1.ogg" - -- files: ["dropship_sonic_boom.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/dropship_sonic_boom.ogg" - -- files: ["genhit1.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/genhit1.ogg" - -- files: ["genhit2.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/genhit2.ogg" - -- files: ["genhit3.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from cmss13" - source: "https://github.com/cmss13-devs/cmss13/blob/91cf6ebdfb47c650faf7ac72fdfff8cd6fc636a0/sound/weapons/genhit3.ogg" diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml b/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml index 703d382e751..9214db02875 100644 --- a/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml +++ b/Resources/Prototypes/_AU14/Entities/Clothing/Armor/marinearmor.yml @@ -6,12 +6,12 @@ components: - type: Sprite sprite: _RMC14/Objects/Clothing/OuterClothing/Armor/m3/standard/padded/jungle.rsi - - type: CMArmor - armor: 20 - bio: 20 - explosionArmor: 15 - - type: RMCArmorSpeedTier - speedTier: medium +# - type: CMArmor +# armor: 20 +# bio: 20 +# explosionArmor: 15 +# - type: RMCArmorSpeedTier +# speedTier: medium - type: ClothingSpeedModifier walkModifier: 0.666 sprintModifier: 0.666 @@ -30,11 +30,11 @@ - type: ClothingSpeedModifier walkModifier: 0.725 sprintModifier: 0.725 - - type: CMArmor - armor: 15 # TODO RMC14 20 bullet - bio: 20 - explosionArmor: 10 - - type: CMHardArmor +# - type: CMArmor +# armor: 15 # TODO RMC14 20 bullet +# bio: 20 +# explosionArmor: 10 +# - type: CMHardArmor - type: entity parent: AU14BaseArmor diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml b/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml index 91adb82a680..e0b8e4975e1 100644 --- a/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml +++ b/Resources/Prototypes/_AU14/Entities/Clothing/glasses.yml @@ -31,7 +31,7 @@ - MASK - type: entity - parent: RMCSunglasses + parent: ClothingEyesGlassesSunglasses id: AU14GlassesPersonalOrange name: orange personal shades description: These are an expensive pair of sunglasses. This brand is popular with UA foot sloggers because its patented mirror refraction has been said to offer protection from atomic flash, solar radiation, and targeting lasers. To top it all off, everyone seems to know a guy who knows a guy who knows a guy that had a laser pistol reflect off of his shades. diff --git a/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml b/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml index 98999afbe41..2409e048f9a 100644 --- a/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml +++ b/Resources/Prototypes/_AU14/Entities/Clothing/goggles.yml @@ -1,3 +1,10 @@ +- type: entity + abstract: true + parent: ClothingEyesBase + id: RMCGogglesBallistic + components: + - type: EyeProtection + - type: entity parent: RMCGogglesBallistic id: AU14GogglesM1A1ClearBallistic @@ -8,10 +15,6 @@ sprite: _AU14/Clothing/Goggles/m1a1clear.rsi - type: Clothing sprite: _AU14/Clothing/Goggles/m1a1clear.rsi - - type: HelmetAccessory - rsi: - sprite: _AU14/Clothing/Goggles/m1a1clear.rsi - state: helmet - type: entity parent: RMCGogglesBallistic @@ -23,10 +26,6 @@ sprite: _AU14/Clothing/Goggles/m1a1.rsi - type: Clothing sprite: _AU14/Clothing/Goggles/m1a1.rsi - - type: HelmetAccessory - rsi: - sprite: _AU14/Clothing/Goggles/m1a1.rsi - state: helmet - type: entity parent: RMCGogglesBallistic @@ -38,10 +37,6 @@ sprite: _AU14/Clothing/Goggles/m1a1dark.rsi - type: Clothing sprite: _AU14/Clothing/Goggles/m1a1dark.rsi - - type: HelmetAccessory - rsi: - sprite: _AU14/Clothing/Goggles/m1a1dark.rsi - state: helmet - type: entity parent: RMCGogglesBallistic @@ -53,10 +48,6 @@ sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi - type: Clothing sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi - - type: HelmetAccessory - rsi: - sprite: _AU14/Clothing/Goggles/m1a1darkalt.rsi - state: helmet - type: entity parent: RMCGogglesBallistic @@ -68,7 +59,3 @@ sprite: _AU14/Clothing/Goggles/m1a1green.rsi - type: Clothing sprite: _AU14/Clothing/Goggles/m1a1green.rsi - - type: HelmetAccessory - rsi: - sprite: _AU14/Clothing/Goggles/m1a1green.rsi - state: helmet \ No newline at end of file diff --git a/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml b/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml index 0c5d92ea43f..55929a223cd 100644 --- a/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml +++ b/Resources/Prototypes/_CM14/Audio/xeno_sound_collections.yml @@ -1,5 +1,5 @@ - type: soundCollection - id: XenoTailSwipe + id: CM14XenoTailSwipe files: - /Audio/.CM14/Xeno/alien_tail_swipe1.ogg - /Audio/.CM14/Xeno/alien_tail_swipe2.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml new file mode 100644 index 00000000000..ff6d43c628a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/entrenching_tool_sound_collections.yml @@ -0,0 +1,13 @@ +- type: soundCollection + id: CMEntrenchingRustle + files: + - /Audio/_RMC14/Entrenching/rustle1.ogg + - /Audio/_RMC14/Entrenching/rustle2.ogg + - /Audio/_RMC14/Entrenching/rustle3.ogg + - /Audio/_RMC14/Entrenching/rustle4.ogg + - /Audio/_RMC14/Entrenching/rustle5.ogg + +- type: soundCollection + id: CMEntrenchingThud + files: + - /Audio/_RMC14/Entrenching/thud.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml new file mode 100644 index 00000000000..fe722efb21c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/explosion_sound_collections.yml @@ -0,0 +1,30 @@ +- type: soundCollection + id: CMExplosion + files: + - /Audio/_RMC14/Explosion/explosion1.ogg + - /Audio/_RMC14/Explosion/explosion2.ogg + - /Audio/_RMC14/Explosion/explosion3.ogg + - /Audio/_RMC14/Explosion/explosion4.ogg + - /Audio/_RMC14/Explosion/explosion5.ogg + +- type: soundCollection + id: RMCExplosionBig + files: + - /Audio/_RMC14/Explosion/bigboom1.ogg + - /Audio/_RMC14/Explosion/bigboom2.ogg + - /Audio/_RMC14/Explosion/bigboom3.ogg + - /Audio/_RMC14/Explosion/bigboom4.ogg + +- type: soundCollection + id: CMHumanFemaleGrenadeThrow + files: + - /Audio/_RMC14/Voice/Human/human_female_grenadethrow_1.ogg + - /Audio/_RMC14/Voice/Human/human_female_grenadethrow_2.ogg + - /Audio/_RMC14/Voice/Human/human_female_grenadethrow_3.ogg + +- type: soundCollection + id: CMHumanMaleGrenadeThrow + files: + - /Audio/_RMC14/Voice/Human/human_male_grenadethrow_1.ogg + - /Audio/_RMC14/Voice/Human/human_male_grenadethrow_2.ogg + - /Audio/_RMC14/Voice/Human/human_male_grenadethrow_3.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml new file mode 100644 index 00000000000..e757838812b --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/food_sound_collections.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: CMFoodRip + files: + - /Audio/_RMC14/Food/rip1.ogg + - /Audio/_RMC14/Food/rip2.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml new file mode 100644 index 00000000000..64a6577a1fb --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/gun_sound_collections.yml @@ -0,0 +1,38 @@ +- type: soundCollection + id: CMShotgunPump + files: + - /Audio/_RMC14/Weapons/Guns/Pump/shotgunpump1.ogg + - /Audio/_RMC14/Weapons/Guns/Pump/shotgunpump2.ogg + +- type: soundCollection + id: CMM1984Shoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg + +- type: soundCollection + id: CMM54CShoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_rifle.ogg # TODO RMC14 + +- type: soundCollection + id: CMSilencedShoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_silenced_shot1.ogg + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_silenced_shot2.ogg + +- type: soundCollection + id: CMShotgunLoad + files: + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load1.ogg + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load2.ogg + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load3.ogg + - /Audio/_RMC14/Weapons/Guns/Reload/shell_load4.ogg + +- type: soundCollection + id: CMAR10Shoot + files: + - /Audio/_RMC14/Weapons/Guns/Gunshots/gun_ar10.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml new file mode 100644 index 00000000000..3ecea932674 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/hijack_sound_collections.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: RMCHijack + files: + - /Audio/_RMC14/Hijack/hiking_in_the_fog.ogg + - /Audio/_RMC14/Hijack/tango_with_bloodshed.ogg + - /Audio/_RMC14/Hijack/storm_the_iron_hive.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml new file mode 100644 index 00000000000..13cf6dbc68a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/medical_sound_collections.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: CMPillBottleOpen + files: + - /Audio/_RMC14/Medical/pillbottle.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml new file mode 100644 index 00000000000..0aa09479f6a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/round_end_sound_collections.yml @@ -0,0 +1,29 @@ +# TODO RMC14 +- type: soundCollection + id: RMCMarineMajor + files: + - /Audio/_RMC14/Announcements/RoundEnd/marine_major.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/winning_triumph2.ogg + +- type: soundCollection + id: RMCMarineMinor + files: + - /Audio/_RMC14/Announcements/RoundEnd/marine_minor.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/neutral_hopeful2.ogg + +- type: soundCollection + id: RMCXenoMajor + files: + - /Audio/_RMC14/Announcements/RoundEnd/xeno_major.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/sad_loss2.ogg + +- type: soundCollection + id: RMCXenoMinor + files: + - /Audio/_RMC14/Announcements/RoundEnd/xeno_minor.ogg + +- type: soundCollection + id: RMCAllDied + files: [] +# - /Audio/_RMC14/Announcements/RoundEnd/neutral_hopeful1.ogg +# - /Audio/_RMC14/Announcements/RoundEnd/neutral_hopeful2.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml new file mode 100644 index 00000000000..c4fa0194863 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/telephone_sound_collections.yml @@ -0,0 +1,10 @@ +- type: soundCollection + id: RMCPhoneSpeak + files: + - /Audio/_RMC14/Phone/talk_phone1.ogg + - /Audio/_RMC14/Phone/talk_phone2.ogg + - /Audio/_RMC14/Phone/talk_phone3.ogg + - /Audio/_RMC14/Phone/talk_phone4.ogg + - /Audio/_RMC14/Phone/talk_phone5.ogg + - /Audio/_RMC14/Phone/talk_phone6.ogg + - /Audio/_RMC14/Phone/talk_phone7.ogg diff --git a/Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml b/Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml new file mode 100644 index 00000000000..f5af612818c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Audio/xeno_sound_collections.yml @@ -0,0 +1,69 @@ +- type: soundCollection + id: XenoChestBurst + files: + - /Audio/_RMC14/Xeno/alien_chestburst.ogg + - /Audio/_RMC14/Xeno/alien_chestburst2.ogg + +- type: soundCollection + id: XenoDrool + files: + - /Audio/_RMC14/Xeno/alien_drool1.ogg + - /Audio/_RMC14/Xeno/alien_drool2.ogg + +- type: soundCollection + id: XenoSpitAcid + files: + - /Audio/_RMC14/Xeno/alien_spitacid.ogg + - /Audio/_RMC14/Xeno/alien_spitacid2.ogg + +- type: soundCollection + id: XenoTailSwipe + files: + - /Audio/_RMC14/Xeno/alien_tail_swipe1.ogg + - /Audio/_RMC14/Xeno/alien_tail_swipe2.ogg + - /Audio/_RMC14/Xeno/alien_tail_swipe3.ogg + +- type: soundCollection + id: XenoQueenCommand + files: + - /Audio/_RMC14/Xeno/alien_queen_command.ogg + - /Audio/_RMC14/Xeno/alien_queen_command2.ogg + - /Audio/_RMC14/Xeno/alien_queen_command3.ogg + +- type: soundCollection + id: XenoFootstepLarge + files: + - /Audio/_RMC14/Xeno/alien_footstep_large1.ogg + - /Audio/_RMC14/Xeno/alien_footstep_large2.ogg + - /Audio/_RMC14/Xeno/alien_footstep_large3.ogg + +- type: soundCollection + id: XenoQueenBreath + files: [] + +- type: soundCollection + id: XenoDeath + files: + - /Audio/_RMC14/Xeno/alien_death.ogg + - /Audio/_RMC14/Xeno/alien_death2.ogg + +- type: soundCollection + id: XenoResinBreak + files: + - /Audio/_RMC14/Xeno/alien_resin_break1.ogg + - /Audio/_RMC14/Xeno/alien_resin_break2.ogg + - /Audio/_RMC14/Xeno/alien_resin_break3.ogg + +- type: soundCollection + id: XenoAcidSizzle + files: + - /Audio/_RMC14/Xeno/acid_sizzle1.ogg + - /Audio/_RMC14/Xeno/acid_sizzle2.ogg + - /Audio/_RMC14/Xeno/acid_sizzle3.ogg + - /Audio/_RMC14/Xeno/acid_sizzle4.ogg + +- type: soundCollection + id: XenoBite + files: + - /Audio/_RMC14/Xeno/alien_bite1.ogg + - /Audio/_RMC14/Xeno/alien_bite2.ogg diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml new file mode 100644 index 00000000000..9a0db1ce656 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Explosives/breaching_charge.yml @@ -0,0 +1,38 @@ +- type: Tag + id: RMCExplosiveBreachingCharge + +- type: entity + parent: BaseItem + id: RMCExplosiveBreachingCharge + name: breaching charge # TODO RMC14 disable with multitool? + description: An explosive device used to break into areas while protecting the user from the blast as well as deploying deadly shrapnel on the other side. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Explosives/satchel_charge.rsi + state: icon + layers: + - state: icon + map: ["base"] + - type: Item + size: Small + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + offset: -0.15,0.0 + - type: LandAtCursor + - type: Explosive + explosionType: Default + totalIntensity: 1 + intensitySlope: 5 + maxIntensity: 1 + canCreateVacuum: false + - type: ExplodeOnTrigger + - type: Appearance + - type: GenericVisualizer + visuals: + enum.Trigger.TriggerVisuals.VisualState: + base: + Primed: { state: active } + Unprimed: { state: icon } + - type: Tag + tags: + - RMCExplosiveBreachingCharge diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml new file mode 100644 index 00000000000..2b993f94eb7 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/base_lmg.yml @@ -0,0 +1,103 @@ +- type: entity + abstract: true + parent: [ CMBaseWeaponGun, BaseItem, RMCBaseAttachableHolder ] + id: RMCBaseWeaponLMG + components: + - type: Gun + baseFireRate: 3.3 + shotsPerBurst: 5 + selectedMode: FullAuto + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + availableModes: + - Fullauto + - SemiAuto + - Burst + # - type: RMCSelectiveFire + # baseFireModes: + # - FullAuto + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # FullAuto: + # maxScatterModifier: 13 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: Wieldable + # - type: WieldableSpeedModifiers + # base: 0.666 + # light: 0.921 + # medium: 0.865 + # heavy: 0.865 + - type: WieldDelay + baseDelay: 0.6 + - type: Item + size: Large + - type: Clothing + slots: + - suitStorage + - Back + - type: AmmoCounter + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 + - type: MagazineAmmoProvider + autoEject: false + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: GunDualWielding + # weaponGroup: Heavy + # - type: GunPointBlank + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/lmg_mouse.rsi + # state: all + +- type: entity + parent: BaseMagazineRifle + id: RMCMagazineLMGBase + abstract: true + components: + - type: Item + size: Normal + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + - type: Clothing + slots: + - suitStorage + +- type: entity + parent: BaseCartridgeRifle + id: RMCBaseCartridgeLMG + name: cartridge + abstract: true + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: Tag + id: RMCMagazineLMG diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml new file mode 100644 index 00000000000..31b975bfcec --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml @@ -0,0 +1,166 @@ +- type: entity + parent: RMCBaseWeaponLMG + name: M60 General Purpose Machine Gun + id: RMCWeaponLMGM60 + description: The Pig. The Action Hero's dream. Chambered in 7.62x51 NATO + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/LMGs/m60.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - sprite: _RMC14/Objects/Weapons/Guns/LMGs/m60.rsi + state: barrel + offset: 0.525, 0.0925 + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/stock.rsi + state: m60_stock + offset: -0.6, 0 + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/LMGs/m60.rsi + - type: Tag + tags: + - RMCWeaponLMGM60 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + shotsPerBurst: 5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m60.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 0 + # recoilUnwielded: 0 + # scatterWielded: 4 + # scatterUnwielded: 4 + # baseFireRate: 3.5 + # burstScatterMult: 3 + # modifiers: + # Burst: + # fireDelay: 0.1 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 0 + # shotsToMaxScatter: 6 + # FullAuto: + # fireDelay: 0.01 + # maxScatterModifier: 4 + # shotsToMaxScatter: 6 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineLMGM60 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineLMGM60 + - type: GunDamageModifier + multiplier: 1 + # - type: UniqueAction + # - type: BreechLoaded + # needOpenClose: false + # - type: Appearance + # - type: GenericVisualizer + # visuals: + # enum.BreechVisuals.Open: + # enum.BreechVisuals.Open: + # True: { state: cover-open } + # False: { state: cover-closed } + # - type: AttachableHolder + # slots: + # rmc-aslot-underbarrel: + # startingAttachable: RMCAttachmentBipod + # whitelist: + # tags: + # - RMCAttachmentBipod + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-underbarrel: 0.618, -0.263 + - type: Wieldable + - type: GunRequiresWield + + +- type: entity + parent: RMCMagazineLMGBase + id: RMCMagazineLMGM60 + name: "M60 Ammo Box (7.62x51 NATO)" + components: + - type: Tag + tags: + - RMCMagazineLMG + - RMCMagazineLMGM60 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeLMGM60 + proto: RMCCartridgeLMGM60 + capacity: 100 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m60.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: RMCCartridgeRifleAR10 + id: RMCCartridgeLMGM60 + name: cartridge (7.62x51) + description: A 7.62x51 NATO cartridge + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeLMGM60 + - type: CartridgeAmmo + proto: RMCBulletLMGM60 + +- type: entity + parent: RMCBaseBullet + id: RMCBulletLMGM60 + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 45 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - type: CMArmorPiercing + # amount: 30 + # - type: RMCProjectileAccuracy + # accuracy: 95 + # thresholds: + # - range: 12 + # falloff: 10 + +- type: Tag + id: RMCWeaponLMGM60 + +- type: Tag + id: RMCMagazineLMGM60 + +- type: Tag + id: RMCCartridgeLMGM60 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml new file mode 100644 index 00000000000..65cdccd605e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/base_grenade_launcher.yml @@ -0,0 +1,67 @@ +- type: entity + abstract: true + parent: [ BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder ] + id: RMCBaseWeaponGrenadeLauncher + components: + - type: Item + size: Large + - type: Gun + projectileSpeed: 20 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + resetOnHandSelected: false + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # - type: ShootAtFixedPoint + # shootArcProj: true + # - type: OnShootTriggerAmmoTimer + # delay: 1 + # beepInterval: 2 + # initialBeepDelay: 0 + # beepSound: + # path: "/Audio/Effects/beep1.ogg" + # params: + # volume: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + # - type: RMCAmmoEject + # containerID: ballistic-ammo + # ejectSound: + # path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + # params: + # volume: -2 + - type: BallisticAmmoProvider + whitelist: + tags: + - LauncherCompatibleGrenade + capacity: 1 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + - type: AmmoCounter + - type: Wieldable + - type: GunRequiresWield + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: WieldDelay + baseDelay: 0.8 + - type: Clothing + slots: + - suitStorage + - type: StaticPrice + price: 500 + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/explosive_mouse.rsi + # state: all diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml new file mode 100644 index 00000000000..5d3ccdfc4c6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml @@ -0,0 +1,215 @@ +- type: entity + name: M5-ATL + parent: [BaseWeaponLauncher, CMBaseWeaponGun, RMCBaseAttachableHolder] + id: RMCWeaponLauncherM5ATL + description: "The M5 Anti-Tank Launcher is a powerful anti-armor infantry weapon, commonly fielded by the UNMC. Used to take out light-tanks and enemy structures, the M5-ATL is a dangerous weapon with a variety of combat uses, depending on the loaded ammunition, and is capable of firing both shells and rocket-propelled grenades.\n\nThis one is missing its smart optics completely, and seems to be damaged, greatly limiting its range..." + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/RocketLaunchers/m5spec.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/RocketLaunchers/m5spec.rsi + quickEquip: true + slots: + - suitStorage + - type: Gun + fireRate: 0.83 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/m5_shoot.ogg + resetOnHandSelected: false + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCRocketAmmo84mm + capacity: 1 + cycleable: true + mayTransfer: false + insertDelay: 6.0 + cycleDelay: 6.0 + proto: RMCRocket84mm + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Cock/m5_ammo.ogg + # - type: GunUserWhitelist + # whitelist: + # components: + # - DemoSpecWhitelist + - type: Corrodible + isCorrodible: false + - type: ExplosionResistance + damageCoefficient: 0 + - type: Wieldable + - type: GunRequiresWield + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: OnShootTriggerAmmoTimer + # delay: 0.2 # TODO RMC14 Make some way for rockets to explode when they stop, for shooting at the ground closer than max range. + # # This is a temporary hack to guarantee it will always go off after stopping even if it doesn't collide with anything. + # # Works for almost all gameplay purposes at least right now because even max range rockets are less than 0.2s and it's fast enough not matter. + # - type: ShootAtFixedPoint + # shootArcProj: false + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: WieldDelay + baseDelay: 1.2 + preventFiring: true + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: -0.057, 0.162 + # - type: IgnorePredictionHide + # - type: GunIgnorePrediction + # - type: AssistedReloadWeapon + +# 84mm HE +- type: entity + id: RMCRocket84mm + name: 84mm high-explosive rocket + parent: BaseItem + description: A rocket tube compatible with the M5-ATL loaded with a HE warhead. Deals high damage to soft targets on direct hit and splashes other targets in a 5-meter-wide area. Has decreased effect on heavily armored targets. + components: + - type: Tag + tags: + - RMCRocketAmmo84mm + - type: CartridgeAmmo + proto: RMCProjectileRocket84mm + deleteOnSpawn: false + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Explosives/m5spec.rsi + layers: + - state: m5_84mm_he + map: ["enum.AmmoVisualLayers.Base"] + - type: Item + size: Normal + - type: Appearance + - type: SpentAmmoVisuals + state: m5_84mm_he + suffix: false + - type: IgnorePredictionHide + # - type: AssistedReloadAmmo + +- type: entity + id: RMCProjectileRocket84mm + name: 84mm high-explosive rocket + categories: [ HideSpawnMenu ] + description: Uh oh. + components: + - type: TriggerOnCollide + # TODO RMC14 Make TriggerOnCollide spawn the explosion on the OtherEntity tile more consistently, so the explosion is centered properly + fixtureID: projectile # no parent entity from BaseBulletTrigger because it has Clickable + - type: Physics + bodyType: Dynamic + fixedRotation: false + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.15,0.15,0.15" + # Bigger than bullets. Rectangle won't work since AABB shapes don't rotate. This should help significantly with explosion consistency. + hard: false + mask: + - Impassable + - BulletImpassable + restitution: 0.0 + density: 20 + - type: Projectile + impactEffect: BulletImpactEffect + damage: + types: + Blunt: 15 + maxFixedRange: 6 # 7 tiles + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/m5spec_projectiles.rsi + layers: + - state: m5_84mm_he + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + maxIntensity: 30 + intensitySlope: 10 + totalIntensity: 290 + maxTileBreak: 0 + # - type: CMExplosionEffect + # - type: RMCScorchEffect + - type: PointLight + radius: 3.5 + color: orange + energy: 0.5 + - type: IgnorePredictionHide + # - type: RMCProjectileAccuracy + # accuracy: 95 + # thresholds: + # - range: 7 + # falloff: 10 + +# 84mm AP + +- type: entity + id: RMCRocket84mmAntiArmor + name: 84mm anti-armor rocket + parent: RMCRocket84mm + description: A rocket tube compatible with the M5-ATL loaded with an AP warhead. Capable of piercing and downing heavily armored targets. Deals very little to no splash damage. Inflicts guaranteed stun to most targets. Has high accuracy within 7 meters. + components: + - type: CartridgeAmmo + proto: RMCProjectileRocket84mmAntiArmor + deleteOnSpawn: false + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Explosives/m5spec.rsi + layers: + - state: m5_84mm_ap + map: ["enum.AmmoVisualLayers.Base"] + - type: SpentAmmoVisuals + state: m5_84mm_ap + suffix: false + - type: IgnorePredictionHide + +- type: entity + id: RMCProjectileRocket84mmAntiArmor + name: 84mm anti-armor rocket + parent: RMCProjectileRocket84mm + categories: [ HideSpawnMenu ] + components: + - type: Projectile + impactEffect: BulletImpactEffect + damage: + types: + Blunt: 160 + Heat: 150 + # 10 brute damage + 150 brute and 150 burn to simulate direct explosive damage. + # Temporary mechanic to make it consistent with intended main target damage. + maxFixedRange: 5 # 6 tiles + armorPenetration: 100 # Ignores all armor. + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/m5spec_projectiles.rsi + layers: + - state: m5_84mm_ap + - type: Explosive + # TODO RMC14 Very inconsistent because explosions spawn at epicenter of the rocket, not the hit entity. Proper values are around (50, 40, 90) + explosionType: Default + maxIntensity: 10 + intensitySlope: 5 + totalIntensity: 35 + maxTileBreak: 0 + # - type: StunOnCollide + # # This only works for AP rockets because it's supposed to have a hardcoded 6 second stun. + # # Almost every other stun in the future should use some kind of configurable and resistable system instead. + # stunAmount: 6 + # knockdownAmount: 6 + - type: IgnorePredictionHide + # - type: RMCProjectileAccuracy + # accuracy: 125 + # thresholds: + # - range: 6 + # falloff: 10 + +# TODO RMC14 84mm WP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml new file mode 100644 index 00000000000..018d9231ea6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m79_grenade_launcher.yml @@ -0,0 +1,48 @@ +- type: entity + name: M79 grenade launcher + parent: [ RMCBaseWeaponGrenadeLauncher ] + id: CMWeaponLauncherM79 + description: The M79 grenade launcher is a single-shot, shoulder-fired, break-action grenade launcher. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m79.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m79.rsi + slots: + - Back + - suitStorage + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/m79_shoot.ogg + # - type: RMCSelectiveFire + # baseFireRate: 0.833 + - type: BallisticAmmoProvider + whitelist: + tags: + - LauncherCompatibleGrenade + capacity: 1 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/m79_reload.ogg + # proto: CMGrenadeHighExplosive # This needs to start with an HIRR baton slug when those get implemented. + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # locked: true + # startingAttachable: RMCAttachmentM79Stock + # whitelist: + # tags: + # - RMCAttachmentM79Stock + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: 0, 0.093 + # rmc-aslot-stock: -0.56, 0.0 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml new file mode 100644 index 00000000000..58ee822d514 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m83_grenade_launcher.yml @@ -0,0 +1,42 @@ +- type: entity + name: M83 grenade launcher + parent: [ RMCBaseWeaponGrenadeLauncher ] + id: WeaponLauncherM83 + description: A heavy, 6-shot grenade launcher used by the UNMC for area denial and big explosions. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/desert.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/desert.rsi + # - type: RMCSelectiveFire + # baseFireRate: 0.3125 + # - type: GunUserWhitelist + # whitelist: + # components: + # - GrenadeSpecWhitelist + - type: BallisticAmmoProvider + capacity: 6 + proto: CMGrenadeHighExplosive + - type: Corrodible + isCorrodible: false + - type: ExplosionResistance + damageCoefficient: 0 + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: 0.0, 0.185 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m83/urban.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml new file mode 100644 index 00000000000..774f2d1c8cf --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m86_riot_launcher.yml @@ -0,0 +1,31 @@ +- type: entity + name: M81 Riot grenade launcher + parent: [ RMCBaseWeaponGrenadeLauncher ] + id: RMCWeaponLauncherM81 + description: The M81 riot grenade launcher is a single-shot, shoulder-fired, break-action grenade launcher designed for police use with Less-lethal munitions. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m81.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/GrenadeLaunchers/m79.rsi + slots: + - Back + - suitStorage + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/m79_shoot.ogg + # - type: RMCSelectiveFire + # baseFireRate: 0.833 + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCGrenadeRiot + capacity: 1 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/m79_reload.ogg + # - type: UniqueAction + # - type: BreechLoaded + # needOpenClose: false diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml new file mode 100644 index 00000000000..1d94cf79c53 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/b92fs.yml @@ -0,0 +1,81 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolB92FS + name: Beretta M92FS + description: A popular police firearm in the 20th century, often employed by hard-boiled cops while confronting terrorists. A classic of its time, chambered in 9mm. Normally found in the hands of Survivors and the Colony Liberation Front. + components: + # - type: RMCSelectiveFire + # scatterWielded: 8 + # scatterUnwielded: 8 + # baseFireRate: 10 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/b92fs.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/b92fs.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Beretta M92FS Magazine (9mm) + startingItem: RMCMagazinePistolB92FS + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolB92FS + - type: GunDamageModifier + multiplier: 0.9 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.25 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolB92FS + name: Beretta M92FS magazine (9mm) + description: A magazine for the Beretta M92FS Pistol. Takes 9mm rounds. + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolB92FS + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + proto: CMCartridgePistol9mm + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/b92fs.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] +- type: Tag + id: RMCMagazinePistolB92FS diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml new file mode 100644 index 00000000000..257b335c682 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml @@ -0,0 +1,136 @@ +- type: entity + parent: [BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder] + abstract: true + id: CMWeaponPistolBase + components: + - type: AmmoCounter + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Item + size: Normal + - type: Tag + tags: + - Sidearm + - type: Clothing + slots: + - suitStorage + - belt + - type: Wieldable + - type: WieldDelay + baseDelay: 0.2 + - type: MeleeWeapon + damage: + types: + Blunt: 6 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + collection: CMM1984Shoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: MagazineAmmoProvider + autoEject: true + # - type: RMCNameItemOnVend + # item: Sidearm + # - type: GunUnskilledPenalty + # angleIncrease: 5 + # - type: GunPointBlank + # - type: GunDualWielding + # weaponGroup: Handgun + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + +- type: entity + abstract: true + parent: BaseMagazinePistol + id: CMBaseMagazinePistol + components: + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + - type: Clothing + slots: + - suitStorage + +- type: entity + abstract: true + parent: BaseCartridgePistol + id: CMCartridgePistolBase + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: entity + abstract: true + parent: RMCBaseBullet + id: CMBulletBase + categories: + - HideSpawnMenu + components: + - type: Projectile + # - type: RMCProjectileDamageFalloff + # - type: RMCProjectileAccuracy + # accuracy: 60 + +- type: entity + parent: CMBulletBase + id: CMBulletPistol9mm + name: bullet (9mm) + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 10 + +- type: Tag + id: CMMagazinePistol diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml new file mode 100644 index 00000000000..ba1e3653287 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml @@ -0,0 +1,111 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolHoldout + name: holdout pistol + description: A tiny pistol meant for hiding in hard-to-reach areas. Best not ask where it came from. + suffix: Filled + components: + - type: Item + size: Tiny + # - type: RMCSelectiveFire + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 4 + # burstScatterMult: 10 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/holdout.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/holdout.rsi + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazinePistolHoldout + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolHoldout + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + - type: Tag + tags: + - Holdout + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolHoldout + name: tiny pistol magazine (.22) + description: A surprisingly small magazine, holding .22 bullets. No Kolibri, but it's getting there. + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolHoldout + - type: Item + size: Tiny + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol.22mm + proto: CMCartridgePistol.22mm + capacity: 5 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/holdout.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: CMBulletBase + id: CMBulletPistol.22mm + name: bullet (.22) + components: + - type: Projectile + damage: + types: + Piercing: 20 + # - type: CMArmorPiercing + # amount: 10 + +- type: entity + id: CMCartridgePistol.22mm + name: cartridge (.22) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistol.22mm + - type: CartridgeAmmo + proto: CMBulletPistol.22mm + + +- type: Tag + id: RMCMagazinePistolHoldout diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml new file mode 100644 index 00000000000..d697d00094e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/hummingbird.yml @@ -0,0 +1,89 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolD18 # TODO Map in on LV-624 + name: D18 Hummingbird + description: The D18 Hummingbird Pistol was produced in the mid-2170s as a cheap and concealable firearm for CLF Sleeper Cell agents for assassinations and ambushes, and is able to be concealed in shoes and workboots. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m43.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m43.rsi + # - type: RMCSelectiveFire + # scatterWielded: 6 + # scatterUnwielded: 6 + # baseFireRate: 10 + # burstScatterMult: 3 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: Item + size: Tiny + - type: GunDamageModifier + multiplier: 1.2 + - type: Tag + tags: + - Holdout + - RMCWeaponPistolD18 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazinePistolD18 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolD18 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.620, 0.05 + # rmc-aslot-rail: -0.03, 0.09 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolD18 + name: D18 magazine (9mm) + description: A small D18 magazine storing seven 9mm bullets. How is it even this small? + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolD18 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + proto: CMCartridgePistol9mm + capacity: 7 + - type: Item + size: Tiny + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4a3.rsi # Placeholder + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: Tag + id: RMCMagazinePistolD18 + +- type: Tag # For stuff like the D18 and Holdout Pistol + id: Holdout + +- type: Tag + id: RMCWeaponPistolD18 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml new file mode 100644 index 00000000000..c7d50f4df83 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m1984_pistol.yml @@ -0,0 +1,109 @@ +- type: entity + parent: CMWeaponPistolBase + id: CMWeaponPistolM1984 + name: M1984 service pistol + description: An M1984 Service Pistol, once the standard issue sidearm of the Marines but has recently been replaced with the M77 combat pistol. Fires 9mm pistol rounds. + components: + # - type: RMCSelectiveFire + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 10 + # burstScatterMult: 5 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m1984.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m1984.rsi + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.2 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolM1984 + - RMCMagazinePistolM1984Rubber + startingItem: CMMagazinePistolM1984 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + +- type: entity + parent: CMWeaponPistolM1984 + id: CMWeaponPistolM1984Empty + suffix: Empty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolM1984 + +- type: entity + parent: CMBaseMagazinePistol + id: CMMagazinePistolM1984 + name: M1984 magazine (9mm) + components: + - type: Tag + tags: + - CMMagazinePistol + - CMMagazinePistolM1984 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + proto: CMCartridgePistol9mm + capacity: 12 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m1984.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: CMCartridgePistol9mm + name: cartridge (9mm) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistol9mm + - type: CartridgeAmmo + proto: CMBulletPistol9mm + +- type: Tag + id: CMMagazinePistolM1984 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml new file mode 100644 index 00000000000..470d7e8d6e2 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/m77_pistol.yml @@ -0,0 +1,147 @@ +- type: entity + parent: CMWeaponPistolBase + id: CMWeaponPistolM77 + name: M77 combat pistol # TODO RMC14 sounds + description: Standard issue Marine firearm. Also found in the hands of We-Ya PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m77.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m77.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 8 + - type: Gun + shotsPerBurst: 3 + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_88m4_v7.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # scatterWielded: 8 + # scatterUnwielded: 8 + # baseFireRate: 4 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolM77Rubber + - CMMagazinePistolM77AP + startingItem: CMMagazinePistolM77AP + - type: GunDamageModifier + multiplier: 1.2 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.625, 0.125 + # rmc-aslot-rail: -0.03, 0.185 + # rmc-aslot-underbarrel: 0.31, -0.186 + +- type: entity + parent: CMWeaponPistolM77 + id: CMWeaponPistolM77Empty + suffix: Empty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolM77AP + + +- type: entity + parent: CMBaseMagazinePistol + id: CMMagazinePistolM77AP + name: M77 AP magazine (9mm) + components: + - type: Tag + tags: + - CMMagazinePistol + - CMMagazinePistolM77AP + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mmAP + proto: CMCartridgePistolM77AP + capacity: 19 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m77.rsi + layers: + - state: base_ap + map: ["enum.GunVisualLayers.Base"] + - state: base_ap-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: base_ap + +- type: entity + id: CMCartridgePistolM77AP + name: cartridge (9mm AP) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistol9mmAP + - type: CartridgeAmmo + proto: CMBulletPistolM77AP + +- type: entity + parent: CMBulletBase + id: CMBulletPistolM77AP + name: bullet (M77 AP) + components: + - type: Projectile + damage: + types: + Piercing: 25 + # - type: CMArmorPiercing + # amount: 40 + +- type: Tag + id: CMMagazinePistolM77AP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml new file mode 100644 index 00000000000..3979b931b61 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk45_pistol.yml @@ -0,0 +1,130 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolMK45 + name: "MK-45 'high-power' automagnum" + description: Originally designed as a replacement for the UNMC's M44 combat revolver, it was rejected at the last minute by a committee, citing its need to be cocked after every loaded magazine to be too cumbersone and antiquated. + suffix: Filled + components: + # - type: RMCSelectiveFire + # scatterWielded: 10 + # scatterUnwielded: 14 + # baseFireRate: 1.428 + - type: GunDamageModifier + multiplier: 1.4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.2 + # accuracyMultiplierUnwielded: 0.85 + # - type: PumpAction + # sound: + # path: /Audio/_RMC14/Weapons/Guns/Cock/gun_pistol_cocked.ogg + # examine: rmc-gun-rack-examine + # popup: rmc-gun-rack-first + # popupKey: rmc-gun-rack-first-with + # once: true + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk45.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk45.rsi + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazinePistolMK45 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_88m4_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolMK45 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentSuppressor + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentLaserSight + # - RMCAttachmentGyroscopicStabilizer + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71, 0.095 + # rmc-aslot-rail: -0.065, 0.125 + # rmc-aslot-underbarrel: 0.312, -0.25 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolMK45 + name: mk-45 automagnum magazine (.45) + description: A pistol magazine. + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolMK45 + - type: Item + size: Tiny + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistolMK45 + proto: CMCartridgePistolMK45 + capacity: 13 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/mk45.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: CMCartridgePistolBase + id: CMCartridgePistolMK45 + name: Cartridge (.45 Automagnum) + components: + - type: Tag + tags: + - Cartridge + - CMCartridgePistolMK45 + - type: CartridgeAmmo + proto: CMBulletPistolMK45 + +- type: entity + parent: CMBulletBase + id: CMBulletPistolMK45 + name: high-powered pistol bullet (.45) + components: + - type: Projectile + damage: + types: + Piercing: 36 + # - type: CMArmorPiercing + # amount: 25 + # - type: RMCProjectileAccuracy + # accuracy: 100 + +- type: Tag + id: RMCMagazinePistolMK45 + +- type: Tag + id: CMCartridgePistolMK45 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml new file mode 100644 index 00000000000..53801818db0 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/mk80_pistol.yml @@ -0,0 +1,143 @@ +- type: entity + parent: CMWeaponPistolBase + id: CMWeaponPistolMK80 + name: MK80 pistol + description: A massive, formidable semi-automatic handgun chambered in 9mm squash-head rounds. A common sight throughout both UN and TSE space, often held by both We-Ya PMC units and corporate executives. This weapon is also undergoing limited field testing as part of the Marines' next generation pistol program. The slide is engraved with the We-Ya logo reminding you who's really in charge. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 8 + - type: Gun + shotsPerBurst: 3 + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_mk80.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 2 + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 2 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mk80_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazinePistolMK80 + startingItem: CMMagazinePistolMK80 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # locked: true + # startingAttachable: RMCAttachmentLaserLightModule + # whitelist: + # tags: + # - RMCAttachmentLaserLightModule + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.685, 0.125 + # rmc-aslot-rail: -0.125, 0.215 + # rmc-aslot-underbarrel: 0.284, -0.19 + - type: Tag + tags: + - Sidearm + - RMCMK80 + +- type: entity + parent: CMBaseMagazinePistol + id: CMMagazinePistolMK80 + name: MK80 magazine (9mm Squash-Head) + components: + - type: Tag + tags: + - CMMagazinePistol + - CMMagazinePistolMK80 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgePistol9mm + - RMCCartridgePistol9mmSquashHead #MK80 is specially chambered to take these rounds, regular pistols cannot. + proto: RMCCartridgePistol9mmSquashHead + capacity: 18 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/mk80.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: RMCCartridgePistol9mmSquashHead + name: cartridge (9mm Squash-Head) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgePistol9mmSquashHead + - type: CartridgeAmmo + proto: RCMBulletPistol9mmSquashHead + +- type: entity # todo rmc14 this is missing a lot of effects, shrapnel, debilitate etc + parent: CMBulletBase + id: RCMBulletPistol9mmSquashHead + name: bullet (9mm Squash-Head) + components: + - type: Projectile + damage: + types: + Piercing: 45 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 6 + # falloff: 5 + # - type: CMArmorPiercing + # amount: 30 + # - type: RMCProjectileAccuracy + # accuracy: 105 + +- type: Tag + id: CMMagazinePistolMK80 + +- type: Tag + id: RMCCartridgePistol9mmSquashHead diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml new file mode 100644 index 00000000000..2010de4273a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/su6_pistol.yml @@ -0,0 +1,119 @@ +- type: entity + parent: CMWeaponPistolBase + id: RMCWeaponPistolSU6 + name: SU-6 smart pistol + description: The SU-6 Smartpistol is an IFF-based sidearm currently undergoing field testing in the UNMC. Uses modified .45 ACP IFF bullets. Capable of firing in bursts. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/su6.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/su6.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 8 + # - type: GunIFF + # enabled: true + - type: Gun + shotsPerBurst: 3 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/su6_shoot.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 2 + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 10 + # burstScatterMult: 5 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: Tag + tags: + - Sidearm + - RMCSmartPistol + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_su6_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_su6_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazinePistolSU6 + startingItem: RMCMagazinePistolSU6 + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.65, 0.09375 + # rmc-aslot-rail: -0.15625, 0.15625 + # rmc-aslot-underbarrel: 0.25, -0.3125 + +- type: entity + parent: CMBaseMagazinePistol + id: RMCMagazinePistolSU6 + name: SU-6 magazine (.45 ACP) + components: + - type: Tag + tags: + - CMMagazinePistol + - RMCMagazinePistolSU6 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgePistol45ACP + proto: RMCCartridgePistol45ACP + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/su6.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: RMCCartridgePistol45ACP + name: cartridge (.45 ACP) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgePistol45ACP + - type: CartridgeAmmo + proto: RMCBulletPistol45ACP + +- type: entity + parent: CMBulletBase + id: RMCBulletPistol45ACP + name: bullet (.45 ACP) + components: + - type: Projectile + damage: + types: + Piercing: 30 + # - type: CMArmorPiercing + # amount: 20 + # - type: RMCProjectileAccuracy + # accuracy: 125 + +- type: Tag + id: RMCMagazinePistolSU6 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml new file mode 100644 index 00000000000..a9cb06369d0 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/base_revolver.yml @@ -0,0 +1,64 @@ +- type: entity + parent: [BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder] + abstract: true + id: RMCWeaponRevolverBase + components: + - type: AmmoCounter + - type: Sprite + state: icon + - type: Item + size: Normal + - type: Tag + tags: + - Sidearm + - RMCRevolver + - type: Clothing + slots: + - suitStorage + - belt + - type: Wieldable + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_44mag.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 1 + # recoilUnwielded: 3 + # scatterWielded: 6 + # scatterUnwielded: 14 + # baseFireRate: 1.429 + - type: ContainerContainer + containers: + revolver-ammo: !type:Container + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCMagazineRevolver + proto: RMCCartridgeRevolver44 + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + - type: Appearance + # - type: RMCNameItemOnVend + # item: Sidearm + # - type: GunUnskilledPenalty + # angleIncrease: 5 + # - type: GunDualWielding + # weaponGroup: Handgun + # - type: GunPointBlank + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 0.85 + +- type: Tag + id: RMCMagazineRevolver + +- type: Tag + id: RMCRevolver diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml new file mode 100644 index 00000000000..9296f36ea1f --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml @@ -0,0 +1,190 @@ +- type: entity + parent: RMCWeaponRevolverBase + id: RMCWeaponRevolverM44 + name: M44 combat revolver + description: A bulky revolver, occasionally carried by assault troops and officers in the Marine Corps, as well as civilian law enforcement. Fires .44 Magnum rounds. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m44.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/m44.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCSpeedLoaderM44 + - RMCCartridgeRevolver44 + proto: RMCCartridgeRevolver44 + capacity: 7 + chambers: [ True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null ] + # - type: RMCSelectiveFire + # baseFireRate: 2 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # - RMCAttachmentB8SmartScope + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentM44MagnumSharpshooterStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.715, 0.125 + # rmc-aslot-rail: 0, 0.185 + # rmc-aslot-stock: -0.59375, 0.09375 + # rmc-aslot-underbarrel: 0.375, -0.155 + +- type: entity + parent: RMCWeaponRevolverM44 + id: RMCWeaponRevolverM44Empty + suffix: Empty + components: + - type: RevolverAmmoProvider + proto: null + +- type: entity + id: RMCBaseSpeedLoader44 + name: "M44 speed loader (.44)" + parent: BaseItem + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - RMCMagazineRevolver + - RMCSpeedLoaderM44 + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCCartridgeRevolver44 + capacity: 7 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + parent: RMCBaseSpeedLoader44 + id: RMCSpeedLoaderM44 + name: "M44 speed loader (.44)" + description: A revolver speed loader. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/m44.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 6 + zeroVisible: false + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolver44 + capacity: 7 + - type: Appearance + +- type: entity + parent: RMCSpeedLoaderM44 + id: RMCSpeedLoader44Marksman + name: "M44 marksman speed loader (.44)" + description: A revolver speed loader filled with Marksman ammo. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/m44.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - state: base-unshaded-5 + color: "#FF744F" + map: [ "enum.GunVisualLayers.MagUnshaded" ] + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolver44Marksman + capacity: 7 + +- type: entity + id: RMCCartridgeRevolver44 + name: cartridge (.44) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolver44 + - type: CartridgeAmmo + proto: CMBulletRevolver44 + +- type: entity + id: RMCCartridgeRevolver44Marksman + name: cartridge (.44) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolver44 + - type: CartridgeAmmo + proto: RMCBulletRevolver44Marksman + +- type: entity + parent: CMBulletBase + id: CMBulletRevolver44 + name: bullet (.44) + components: + - type: Projectile + damage: + types: + Piercing: 72 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileAccuracy + # accuracy: 90 + +- type: entity + parent: CMBulletBase + id: RMCBulletRevolver44Marksman + name: bullet (.44 Marksman) + components: + - type: Projectile + damage: + types: + Piercing: 55 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - type: CMArmorPiercing + # amount: 35 + # - type: RMCProjectileAccuracy + # accuracy: 90 + # thresholds: + # - range: 12 + # falloff: 10 + +- type: Tag + id: RMCSpeedLoaderM44 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml new file mode 100644 index 00000000000..28431a13a94 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml @@ -0,0 +1,140 @@ +- type: entity + parent: RMCWeaponRevolverBase + id: RMCWeaponRevolverMateba + name: Mateba autorevolver custom + description: The .454 Mateba 6 Unica autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking UNMC officials. Stylish, sophisticated, and above all, extremely deadly. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mateba/jungle.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mateba/jungle.rsi + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_mateba.ogg + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCSpeedLoaderMateba + - RMCCartridgeRevolverMateba + proto: RMCCartridgeRevolverMateba + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: GunDamageModifier + multiplier: 1.5 + # - type: RMCSelectiveFire + # baseFireRate: 1.111 + # scatterWielded: 8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # accuracyMultiplierUnwielded: 0.75 + - type: Appearance + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # startingAttachable: RMCAttachmentMatebaStandard + # whitelist: + # tags: + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentMatebaStandard + # - RMCAttachmentBarrelCharger + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.215, 0.19 + # rmc-aslot-rail: -0.11, 0.22 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Pistols/mateba/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Pistols/mateba/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Pistols/mateba/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Pistols/mateba/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Pistols/mateba/urban.rsi + +- type: entity + id: RMCBaseSpeedLoaderMateba + name: "Mateba speed loader (.454)" + parent: BaseItem + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - RMCMagazineRevolver + - RMCSpeedLoaderMateba + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCCartridgeRevolverMateba + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + parent: RMCBaseSpeedLoaderMateba + id: RMCSpeedLoaderMateba + description: A formidable .454 speedloader, made exclusively for the Mateba autorevolver. Packs a devastating punch. This standard-variant is optimized for anti-armor. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/mateba.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 6 + zeroVisible: false + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolverMateba + capacity: 6 + - type: Appearance + +- type: entity + id: RMCCartridgeRevolverMateba + name: cartridge (.454) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolverMateba + - type: CartridgeAmmo + proto: RMCBulletMateba + +- type: entity + parent: CMBulletBase + id: RMCBulletMateba + name: bullet (.454) + components: + - type: Projectile + damage: + types: + Piercing: 60 + # - type: CMArmorPiercing + # amount: 20 + # - type: RMCStunOnHit + # maxRange: 4.5 + # stunTime: 1 + # - type: RMCProjectileAccuracy + # accuracy: 90 + +- type: Tag + id: RMCSpeedLoaderMateba + +- type: Tag + id: RMCCartridgeRevolverMateba diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml new file mode 100644 index 00000000000..cfe295375b9 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml @@ -0,0 +1,132 @@ +- type: entity + parent: RMCWeaponRevolverBase + id: RMCWeaponRevolverRSh9 + name: RSh-9 Assault Revolver + description: The RSh-9 Assault Revolver is a highly unusual weapon, originally designed for CQB Room clearing on request for counter-terrorism units. This one uses the smaller 9x39 cartridge instead of the 12.7x55mm Cartridge it was originally chambered in, It is still nothing short of the ultimate man killing device. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/rsh9.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Pistols/rsh9.rsi + - type: Gun + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/rsh9_fire.ogg + - type: RevolverAmmoProvider + whitelist: + tags: + - RMCSpeedLoaderRsh9 + - RMCCartridgeRevolverRsh9 + proto: RMCCartridgeRevolverRsh9 + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: GunDamageModifier + multiplier: 1.1 + # - type: RMCSelectiveFire + # baseFireRate: 1.2 + # scatterWielded: 8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # accuracyMultiplierUnwielded: 0.75 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentBarrelCharger + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, 0.099 + # rmc-aslot-rail: 0.1573, 0.188 + # rmc-aslot-underbarrel: 0.375, -0.1825 + +- type: entity + id: RMCBaseSpeedLoaderRsh9 + name: "RSh-9 Speed Loader (9x39)" + parent: BaseItem + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - RMCMagazineRevolver + - RMCSpeedLoaderRsh9 + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - RMCCartridgeRevolverRsh9 + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + parent: RMCBaseSpeedLoaderRsh9 + id: RMCSpeedLoaderRsh9 + description: A six round load of 9x39 Armor Penetrating rounds, designed to defeat most modern body-armor. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/SpeedLoaders/mateba.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-5 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 6 + zeroVisible: false + - type: BallisticAmmoProvider + proto: RMCCartridgeRevolverRsh9 + capacity: 6 + - type: Appearance + +- type: entity + id: RMCCartridgeRevolverRsh9 + name: cartridge (9x39) + parent: CMCartridgePistolBase + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRevolverRsh9 + - type: CartridgeAmmo + proto: RMCBulletRsh9 + +- type: entity + parent: CMBulletBase + id: RMCBulletRsh9 + name: bullet (9x39) + components: + - type: Projectile + damage: + types: + Piercing: 65 + armorPenetration: 35 + # - type: RMCProjectileAccuracy + # accuracy: 90 + +- type: Tag + id: RMCSpeedLoaderRsh9 + +- type: Tag + id: RMCCartridgeRevolverRsh9 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml new file mode 100644 index 00000000000..613cabd9a9d --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/ar10_rifle.yml @@ -0,0 +1,162 @@ +- type: entity + parent: CMBaseWeaponRifle + name: AR10 Assault Rifle + id: WeaponRifleAR10 + description: An earlier version of the more widespread M16 rifle. Considered to be the father of the 20th century rifle. How one of these ended up here is a mystery of its own. It is chambered in 7.62x51mm. + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/ar10.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/stock.rsi # Stock has no effects, no reason to make it an attachment + state: ar10_stock + offset: -0.5, 0 + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/ar10.rsi + - type: Gun + shotsPerBurst: 3 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + collection: CMAR10Shoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilUnwielded: 3 + # scatterWielded: 4 + # scatterUnwielded: 20 + # baseFireRate: 2 + # burstScatterMult: 2 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineRifleAR10 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineRifleAR10 + - type: GunDamageModifier + multiplier: 1.4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.4 + # accuracyMultiplierUnwielded: 0.5 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.75, 0.00 + # rmc-aslot-rail: -0.23, 0.091 + # rmc-aslot-underbarrel: 0.35, -0.3 + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineRifleAR10 + name: "AR10 Magazine (7.62x51mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleAR10 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeRifleAR10 + proto: RMCCartridgeRifleAR10 + capacity: 20 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/ar10.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: CMBaseCartridgeRifle + id: RMCCartridgeRifleAR10 + name: Cartridge (7.62x51) + description: A 7.62x51 rifle cartridge + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleAR10 + - type: CartridgeAmmo + proto: BulletRifleAR10 + +- type: entity + parent: RMCBaseBullet + id: BulletRifleAR10 + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 24 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 4 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 16 + # falloff: 10 + +- type: Tag + id: RMCMagazineRifleAR10 + +- type: Tag + id: RMCCartridgeRifleAR10 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml new file mode 100644 index 00000000000..e0c63213068 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/base_rifle.yml @@ -0,0 +1,109 @@ +- type: entity + abstract: true + parent: [ CMBaseWeaponGun, BaseItem, RMCBaseAttachableHolder ] + id: CMBaseWeaponRifleNoDualWieldPenalty + components: + - type: Gun + shotsPerBurst: 3 + selectedMode: Burst + availableModes: + - SemiAuto + - Burst + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 1 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 1.429 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.1665 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 13 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + - type: Wieldable + # - type: WieldableSpeedModifiers + # base: 0.666 + # light: 0.921 + # medium: 0.865 + # heavy: 0.865 + - type: WieldDelay + baseDelay: 0.6 + - type: Item + size: Large + - type: Clothing + slots: + - suitStorage + - Back + - type: AmmoCounter + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 + - type: MagazineAmmoProvider + autoEject: true + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/rifle_mouse.rsi + # state: all + +- type: entity + parent: CMBaseWeaponRifleNoDualWieldPenalty + id: CMBaseWeaponRifle + # components: + # - type: GunDualWielding + # weaponGroup: Rifle + # - type: GunPointBlank + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.65 + # - type: GunGroupPenalty + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineRifleBase + abstract: true + components: + - type: Item + size: Normal + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + - type: Clothing + slots: + - suitStorage + +- type: entity + parent: BaseCartridgeRifle + id: CMBaseCartridgeRifle + name: cartridge + abstract: true + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: Tag + id: CMMagazineRifle diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml new file mode 100644 index 00000000000..e0eb49dbcbc --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml @@ -0,0 +1,132 @@ +- type: entity + parent: CMBaseWeaponRifle + id: WeaponRifleM16 # TODO: Make the M16 grenadier rifle when impact nades exist + name: M16 rifle + description: An old, reliable design first adopted by the U.S. military in the 1960s. Something like this belongs in a museum of war history. It is chambered in 5.56x45mm. + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m16.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/stock.rsi # TODO RMC14 effects + state: m16-stock + offset: -0.5, 0 + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m16.rsi + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m16.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilUnwielded: 3 + # scatterWielded: 2 + # scatterUnwielded: 20 + # baseFireRate: 4 + # burstScatterMult: 2 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.35 + # accuracyMultiplierUnwielded: 0.65 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineRifleM16 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineRifleM16 + - type: GunDamageModifier + multiplier: 1.3 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # startingAttachable: RMCAttachmentS42xTelescopicMiniscope + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, -0.03 + # rmc-aslot-rail: -0.15, 0.12 + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineRifleM16 # TODO RMC14 attachments + name: "M16 Magazine (5.56x45mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM16 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeRifleM16 + proto: RMCCartridgeRifleM16 + capacity: 20 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m16.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: CMBaseCartridgeRifle + id: RMCCartridgeRifleM16 + name: Cartridge (5.56x45) + description: A 5.56x45 rifle cartridge + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM16 + - type: CartridgeAmmo + proto: BulletRifle5.56x45mm + +- type: entity + parent: BulletRifle10x24mm + id: BulletRifle5.56x45mm + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 5 + +- type: Tag + id: RMCMagazineRifleM16 + +- type: Tag + id: RMCCartridgeRifleM16 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml new file mode 100644 index 00000000000..99fc00c0753 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_rifle.yml @@ -0,0 +1,203 @@ +- type: entity + parent: CMBaseWeaponRifle + name: M4SPR battle rifle + id: WeaponRifleM4SPR + description: The M4SPR battle rifle is a designated marksman rifle in service with the Marine. Sporting a bullpup configuration, the M4SPR battle rifle is perfect for reconnaissance and fire support teams. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + state: d_m4spr_barrel + offset: 0.65, 0 + map: [ "barrel" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + - type: Gun + shotsPerBurst: 0 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m4spr.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilUnwielded: 2 + # scatterWielded: 6 + # baseFireRate: 2.86 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.25 + # accuracyMultiplierUnwielded: 0.6 + # - type: RMCWeaponDamageFalloff + # falloffMultiplier: 0 + - type: WieldDelay + baseDelay: 0.2 + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM4SPR + - CMMagazineRifleM4SPRAP + - CMMagazineRifleM4SPRExt + - type: GunDamageModifier + multiplier: 1.4 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentB8SmartScope + # - RMCAttachmentMagneticHarness + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS42xTelescopicMiniscope + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 1.12, 0.0 + # rmc-aslot-rail: 0.225, 0.125 + # rmc-aslot-underbarrel: 0.62, -0.31 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/urban.rsi + # layers: + # barrel: + # Jungle: m4spr_barrel + # Desert: d_m4spr_barrel + # Snow: s_m4spr_barrel + # Classic: c_m4spr_barrel + # Urban: u_m4spr_barrel + +- type: entity + parent: WeaponRifleM4SPR + id: WeaponRifleM4SPRFilled + suffix: Filled + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: CMMagazineRifleM4SPR + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM4SPR + - CMMagazineRifleM4SPRAP + - CMMagazineRifleM4SPRExt + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m4spr/urban.rsi + +- type: entity + parent: CMMagazineRifleBase + id: CMMagazineRifleM4SPR + name: "M4SPR magazine (10x24mm)" + description: "A magazine of standard 10x24mm rounds for use in the M4SPR battle rifle." + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM4SPR + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 25 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spr.rsi + +- type: entity + parent: CMMagazineRifleM4SPR + id: CMMagazineRifleM4SPRAP + name: M4SPR AP magazine (10x24mm) + description: "A magazine of armor-piercing 10x24mm rounds for use in the M4SPR battle rifle." + suffix: AP + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM4SPRAP + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spr.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: ammo_band + color: "#1F951F" + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridgeRifle10x24mmAP + proto: CMCartridgeRifle10x24mmAP + +- type: entity + parent: CMMagazineRifleM4SPR + id: CMMagazineRifleM4SPRExt + name: "M4SPR extended magazine (10x24mm)" + components: + - type: BallisticAmmoProvider + capacity: 35 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spre.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM4SPRExt + +- type: Tag + id: CMMagazineRifleM4SPR + +- type: Tag + id: CMMagazineRifleM4SPRAP + +- type: Tag + id: CMMagazineRifleM4SPRExt diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml new file mode 100644 index 00000000000..acc95b4d686 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml @@ -0,0 +1,301 @@ +- type: entity + parent: WeaponRifleM4SPR + name: M4SPR custom battle rifle + id: WeaponRifleM4SPRCustom + description: An improvement over the already great M4SPR. Able to take A19 rounds, as well as having better control and accuracy at the cost of being harder to use. Can take traditional M4SPR mags, at lower damage. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + state: d_m4spr_custom_barrel + offset: 0.65, 0 + map: [ "barrel" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 1 + # recoilUnwielded: 4 + # scatterWielded: 2.5 + # scatterUnwielded: 8 + # baseFireRate: 1.8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # - type: GunDamageModifier + # multiplier: 1.1 # Lower to allow for normal M4SPR mags to have lower damage. A19 mags do more damage to compensate. + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + - type: Gun + shotsPerBurst: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m4spr.ogg + # - type: GunUserWhitelist + # whitelist: + # components: + # - ScoutWhitelist + - type: Corrodible + isCorrodible: false + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/desert.rsi + - type: MeleeWeapon + attackRate: 1 + damage: + types: + Slash: 31 # Yes this does this much damage in 13. 51 with a bayonet attached. + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS42xTelescopicMiniscope + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/l42_unload.ogg + priority: 2 + startingItem: RMCMagazineRifleM4SPRA19 + whitelist: + tags: + - CMMagazineRifleM4SPR + - CMMagazineRifleM4SPRAP + - CMMagazineRifleM4SPRExt + - RMCMagazineRifleM4SPRA19 + - RMCMagazineRifleM4SPRA19Impact + - RMCMagazineRifleM4SPRA19Incendiary + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m4spr_custom/urban.rsi + # layers: + # barrel: + # Jungle: m4spr_custom_barrel + # Desert: d_m4spr_custom_barrel + # Snow: s_m4spr_custom_barrel + # Classic: c_m4spr_custom_barrel + # Urban: u_m4spr_custom_barrel + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineRifleM4SPRA19 + name: "A19 HV magazine (10x24mm)" + description: "A magazine of A19 high velocity rounds for use in the M4SPR custom battle rifle. The M4SPR custom battle rifle is the only gun that can chamber these rounds." + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM4SPRA19 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - RMCCartridgeRifleM4SPRA19 + proto: RMCCartridgeRifleM4SPRA19 + capacity: 18 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spra19.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: RMCMagazineRifleM4SPRA19 + id: RMCMagazineRifleM4SPRA19Impact + name: "A19 HV high impact magazine (10x24mm)" + description: "A magazine of A19 HV high impact rounds for use in the M4SPR custom battle rifle. The M4SPR custom battle rifle is the only gun that can chamber these rounds." + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM4SPRA19Impact + - type: BallisticAmmoProvider + proto: RMCCartridgeRifleM4SPRA19Impact + whitelist: + tags: + - RMCCartridgeRifleM4SPRA19Impact + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spra19.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: ammo_band + color: "#00CDEA" + +- type: entity + parent: RMCMagazineRifleM4SPRA19 + id: RMCMagazineRifleM4SPRA19Incendiary + name: "A19 HV incendiary magazine (10x24mm)" + description: "A magazine of A19 HV incendiary rounds for use in the M4SPR custom battle rifle. The M4SPR custom battle rifle is the only gun that can chamber these rounds." + components: + - type: Tag + tags: + - CMMagazineRifle + - RMCMagazineRifleM4SPRA19Incendiary + - type: BallisticAmmoProvider + proto: RMCCartridgeRifleM4SPRA19Incendiary + whitelist: + tags: + - RMCCartridgeRifleM4SPRA19Incendiary + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m4spra19.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: ammo_band + color: "#9C2219" + +- type: entity + parent: CMBaseCartridgeRifle + id: RMCCartridgeRifleM4SPRA19 + name: cartridge (A19 high-velocity) + description: A high-velocity A19 cartridge. Fits in M4SPR custom magazines. + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM4SPRA19 + - type: CartridgeAmmo + proto: BulletRifleM4SPRA19 + +- type: entity + parent: RMCCartridgeRifleM4SPRA19 + id: RMCCartridgeRifleM4SPRA19Impact + name: cartridge (A19 high-velocity high impact) + description: A high-velocity high impact A19 cartridge. Fits in M4SPR custom magazines. + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM4SPRA19Impact + - type: CartridgeAmmo + proto: BulletRifleM4SPRA19Impact + +- type: entity + parent: RMCCartridgeRifleM4SPRA19 + id: RMCCartridgeRifleM4SPRA19Incendiary + name: cartridge (A19 high-velocity incendiary) + description: A high-velocity incendiary A19 cartridge. Fits in M4SPR custom magazines. + components: + - type: Tag + tags: + - Cartridge + - RMCCartridgeRifleM4SPRA19Incendiary + - type: CartridgeAmmo + proto: BulletRifleM4SPRA19Incendiary + +- type: entity + parent: RMCBaseBullet + id: BulletRifleM4SPRA19 + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 55 + # - type: CMArmorPiercing + # amount: 35 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 16 + # falloff: 10 + # - range: 4 + # falloff: 10 + # buildup: true + +- type: entity + parent: RMCBaseBullet + id: BulletRifleM4SPRA19Impact + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 50 + # - type: RMCStunOnHit + # maxRange: 32 + # losesEffectWithRange: true + # stunTime: 1 + # superSlowTime: 4 + # slowTime: 10 + # - type: RMCProjectileAccuracy + # accuracy: 75 + # thresholds: + # - range: 16 + # falloff: 10 + # - range: 4 + # falloff: 10 + +- type: entity + parent: RMCBaseBullet + id: BulletRifleM4SPRA19Incendiary + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: CMArmorPiercing + # amount: 25 + # - type: RMCProjectileAccuracy + # accuracy: 95 + - type: IgniteOnProjectileHit + +- type: Tag + id: RMCMagazineRifleM4SPRA19 + +- type: Tag + id: RMCMagazineRifleM4SPRA19Impact + +- type: Tag + id: RMCMagazineRifleM4SPRA19Incendiary + +- type: Tag + id: RMCCartridgeRifleM4SPRA19 + +- type: Tag + id: RMCCartridgeRifleM4SPRA19Impact + +- type: Tag + id: RMCCartridgeRifleM4SPRA19Incendiary diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml new file mode 100644 index 00000000000..2ebc6985f88 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_heavy_rifle.yml @@ -0,0 +1,147 @@ +- type: entity + name: M54CE2 heavy assault rifle + parent: CMBaseWeaponRifle + id: WeaponRifleM54CE2 + description: A large squad support weapon capable of laying down sustained suppressing fire from a mounted position. While unstable and less accurate, it can be lugged and shot with two hands. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/desert.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/desert.rsi + - type: Tag + tags: + - WeaponRifleM54CE2 + - RMCGunBipodFullAuto + - type: Gun + shotsPerBurst: 5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + soundGunshot: + collection: CMM54CShoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilUnwielded: 5 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 5 + # burstScatterMult: 6 + # modifiers: + # Burst: + # fireDelay: 0.1332 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 14 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 30 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.5 + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: CMMagazineRifleM54CE2 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/hpr_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/hpr_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM54CE2 + - type: GunRequiresWield + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-underbarrel: + # startingAttachable: RMCAttachmentBipod + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentBurstFireAssembly + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals # CHANGE THESE WHEN THIS THING GETS ITS OWN SPRITE + # offsets: + # rmc-aslot-barrel: 0.81, 0.029 + # rmc-aslot-rail: 0.125, 0.185 + # rmc-aslot-stock: -0.875, 0.0325 + # rmc-aslot-underbarrel: 0.35, -0.4 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m54ce2/urban.rsi + +- type: entity + parent: CMMagazineRifleM54C + id: CMMagazineRifleM54CE2 + name: "M54CE2 magazine (10x24mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54CE2 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 300 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/desert.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce2/urban.rsi + +- type: Tag + id: WeaponRifleM54CE2 + +- type: Tag + id: CMMagazineRifleM54CE2 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml new file mode 100644 index 00000000000..145099759b4 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m54c_rifle.yml @@ -0,0 +1,259 @@ +- type: entity + parent: CMBaseWeaponRifle + name: M54C assault rifle MK2 + id: WeaponRifleM54C + description: The standard issue rifle of the Marines. Commonly carried by most combat personnel. Uses 10x24mm caseless ammunition. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54c/desert.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m54c/desert.rsi + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + selectedMode: FullAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + soundGunshot: + collection: CMM54CShoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilUnwielded: 4 + # scatterWielded: 6 + # scatterUnwielded: 20 + # baseFireRate: 4 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.3 + # accuracyMultiplierUnwielded: 0.65 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM54C + - CMMagazineRifleM54CAP + - CMMagazineRifleM54CExt + - type: GunDamageModifier + multiplier: 1.1 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM54CStockCollapsible + # whitelist: + # tags: + # - RMCAttachmentM54CStockSolid + # - RMCAttachmentM54CStockCollapsible + # rmc-aslot-underbarrel: + # startingAttachable: RMCAttachmentU1GrenadeLauncher + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentU1GrenadeLauncher + # - RMCAttachmentU7UnderbarrelShotgun + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.75, 0.00 + # rmc-aslot-rail: 0.1, 0.16 + # rmc-aslot-stock: -0.78, 0.0325 + # rmc-aslot-underbarrel: 0.35, -0.343 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m54c/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m54c/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m54c/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m54c/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m54c/urban.rsi + +- type: entity + parent: CMMagazineRifleBase + id: CMMagazineRifleM54C + name: "M54C magazine (10x24mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54C + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 40 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54c.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Appearance + +- type: entity + parent: CMMagazineRifleM54C + id: CMMagazineRifleM54CAP + name: "M54C AP magazine (10x24mm)" + suffix: AP + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54CAP + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridgeRifle10x24mmAP + proto: CMCartridgeRifle10x24mmAP + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54c.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: ammo_band + color: "#1F951F" + +- type: entity + parent: CMMagazineRifleM54C + id: CMMagazineRifleM54CExt + name: "M54C extended magazine (10x24mm)" + components: + - type: Tag + tags: + - CMMagazineRifle + - CMMagazineRifleM54CExt + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeRifle10x24mm + proto: CMCartridgeRifle10x24mm + capacity: 60 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m54ce.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: CMBaseCartridgeRifle + id: CMCartridgeRifle10x24mm + name: cartridge (10x24mm) + description: A 10x24mm cartridge. Fits in 10x24mm magazines. + components: + - type: Tag + tags: + - Cartridge + - CMCartridgeRifle10x24mm + - type: CartridgeAmmo + proto: BulletRifle10x24mm + +- type: entity + parent: CMCartridgeRifle10x24mm + id: CMCartridgeRifle10x24mmAP + name: AP cartridge (10x24mm) + description: An armor piercing 10x24mm cartridge. Fits in 10x24mm AP magazines. + components: + - type: Tag + tags: + - Cartridge + - CMCartridgeRifle10x24mmAP + - type: CartridgeAmmo + proto: BulletRifle10x24mmAP + +- type: entity + parent: RMCBaseBullet + id: BulletRifle10x24mm + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 40 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 24 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 4 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 16 + # falloff: 10 + +- type: entity + parent: BulletRifle10x24mm + id: BulletRifle10x24mmAP + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 30 + # - type: CMArmorPiercing + # amount: 40 + +- type: Tag + id: CMMagazineRifleM54C + +- type: Tag + id: CMMagazineRifleM54CAP + +- type: Tag + id: CMMagazineRifleM54CExt + +- type: Tag + id: CMCartridgeRifle10x24mm + +- type: Tag + id: CMCartridgeRifle10x24mmAP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml new file mode 100644 index 00000000000..cf47861a52d --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m59a_prototype_rifle.yml @@ -0,0 +1,126 @@ +- type: entity + parent: CMBaseWeaponRifle + name: M59A prototype rifle + id: WeaponRifleM59A + description: A prototype M59A, an experimental rifle platform built to outperform the standard M54C. Back issue only. Uses standard MK1 & MK2 rifle magazines. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m59a/desert.rsi #TODO RMC: Change when new sprites + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/m59a/desert.rsi #TODO RMC: Change when new sprites + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + shotsPerBurst: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + soundGunshot: + collection: CMM54CShoot + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # # - FullAuto #TODO RMC: re-enable when the full auto fire mode switch crash to desktop is fixed + # recoilUnwielded: 4 + # #fireDelay: 0.2332 + # scatterWielded: 6 + # scatterUnwielded: 20 + # baseFireRate: 4.85 #semi auto is -> 171 rpm - 2.86/s + # burstScatterMult: 3 + # modifiers: + # SemiAuto: + # fireDelay: 0.15 + # Burst: + # fireDelay: 0.1 #290 rpm - 4.85/s + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # fireDelay: 0 #290rpm - 4.85/s same as burst + # maxScatterModifier: 8 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: GunIDLock + # - type: GunIFF + # enabled: true + # - type: IFFToggle + # requireIDLock: true + # changeStats: true + # iFFFireModes: + # - SemiAuto + # iFFModifiers: + # SemiAuto: + # fireDelay: 0.25 #133 rpm - 2.22/s + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineRifleM54C + - CMMagazineRifleM54CAP + - CMMagazineRifleM54CExt + #TODO RMC: Add the MK1 mags here when they are added + startingItem: CMMagazineRifleM54C #TODO RMC: Change to incend magazine when that is added, parity. + - type: GunDamageModifier + multiplier: 1.15 + # - type: RMCMagneticItem + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS84xTelescopicScope + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentM54CStockCollapsible + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentBipod + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentU1GrenadeLauncher + # - RMCAttachmentU7UnderbarrelShotgun + # - RMCAttachmentVerticalGrip + # #TODO RMC: add underbarrel flamer (and adv underbarrel flamer) and underbarrel extinguisher here when they are added + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.8125, 0.03125 + # rmc-aslot-rail: 0.1, 0.09375 + # rmc-aslot-stock: -0.78, 0.0325 + # rmc-aslot-underbarrel: 0.35, -0.343 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/m59a/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/m59a/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/m59a/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/m59a/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/m59a/urban.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml new file mode 100644 index 00000000000..14f2d871af6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml @@ -0,0 +1,39 @@ +- type: entity + parent: CMShellShotgunBase + id: RMCCartridge458SOCOM + name: handful of .458 SOCOM bullets + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm88.rsi + layers: + - state: SOCOM1 + map: [ "base" ] + - type: CartridgeAmmo + proto: RMCBullet458SOCOM + - type: Stack + count: 9 + stackType: RMCCartridge458SOCOM + baseLayer: base + layerStates: + - SOCOM1 + - SOCOM1 + - SOCOM2 + - SOCOM3 + - SOCOM4 + - SOCOM5 + - SOCOM6 + - SOCOM7 + - SOCOM8 + - SOCOM9 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCCartridge458SOCOM + +- type: stack + id: RMCCartridge458SOCOM + name: handful of .458 SOCOM bullets + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm88.rsi, state: SOCOM1 } + spawn: RMCCartridge458SOCOM + maxCount: 9 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml new file mode 100644 index 00000000000..22317d5e150 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml @@ -0,0 +1,155 @@ +- type: entity + parent: CMBaseWeaponRifle + name: XM88 Heavy Rifle + id: WeaponRifleXM88 + description: An experimental man-portable anti-materiel rifle chambered in .458 SOCOM. It must be manually chambered for every shot. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Rifles/xm88/desert.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Rifles/xm88/desert.rsi + - type: Gun + fireRate: 0.8 + shotsPerBurst: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_boomslang_fire.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 3 + # recoilUnwielded: 5 + # scatterWielded: 6 + # scatterUnwielded: 20 + # baseFireRate: 0.8 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.1 + # accuracyMultiplierUnwielded: 0.5 + - type: WieldDelay + baseDelay: 0.4 + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + # - type: PumpAction + # sound: + # path: /Audio/_RMC14/Weapons/Guns/Pump/gun_boomslang_lever.ogg + - type: BallisticAmmoProvider + cycleable: true + whitelist: + tags: + - RMCCartridge458SOCOM + capacity: 9 + proto: RMCCartridge458SOCOM + soundInsert: + collection: CMShotgunLoad + - type: GunDamageModifier + multiplier: 1 + # - type: GunStacks + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentMagneticHarness + # - RMCAttachmentRailFlashlight + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentXS-9 # 99% of it is TODO + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentXM88Stock + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.71875, 0.0 + # rmc-aslot-rail: -0.15625, 0.0625 + # rmc-aslot-underbarrel: 0.24, -0.3 + # rmc-aslot-stock: -0.56, 0.03 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Rifles/xm88/jungle.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Rifles/xm88/snow.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Rifles/xm88/desert.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Rifles/xm88/urban.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Rifles/xm88/classic.rsi + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/XM88/xm88-0.rsi + # state: all + +- type: entity + parent: BulletRifle10x24mm + id: RMCBullet458SOCOM + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 104 + # - type: CMArmorPiercing + # amount: 10 + # - type: GunStacksProjectile + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 1 + # - type: RMCProjectileAccuracy + # accuracy: 90 + # thresholds: + # - range: 14 + # falloff: 10 + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBox458SOCOM + name: box of .458 SOCOM + description: A box filled with handfuls of .458 SOCOM rounds, designed for use with the XM88 heavy rifle. + components: + - type: Storage + grid: + - 0,0,21,1 + whitelist: + tags: + - RMCCartridge458SOCOM + - type: StorageFill + contents: + - id: RMCCartridge458SOCOM + amount: 11 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Boxes/SOCOM_box.rsi + layers: + - state: SOCOMFULL32subdiv + map: [ "full" ] + - state: Socom32e + map: [ "empty" ] + # - type: RMCStorageEjectHand + - type: Tag + tags: + - RMCBox458SOCOM + +- type: Tag + id: RMCCartridge458SOCOM + +- type: Tag + id: RMCBox458SOCOM diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml new file mode 100644 index 00000000000..efc67ff40b2 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/base_smg.yml @@ -0,0 +1,61 @@ +- type: entity + abstract: true + parent: CMBaseWeaponRifle + id: CMBaseWeaponSMG + components: + - type: Item + size: Large + - type: AmmoCounter + - type: Gun + selectedMode: FullAuto + availableModes: + - SemiAuto + - Burst + - FullAuto + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # modifiers: + # FullAuto: + # maxScatterModifier: 12 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: WieldableSpeedModifiers + # base: 0.725 + # light: 1 + # medium: 1 + # heavy: 1 + - type: WieldDelay + baseDelay: 0.2 + # - type: RMCNameItemOnVend + # item: PrimaryGun + # - type: GunUnskilledPenalty + # angleIncrease: 20 + - type: Tag + tags: + - RMCWeaponSMG + # - type: GunDualWielding + # weaponGroup: Submachinegun + # - type: GunPointBlank + # - type: GunGroupPenalty + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/pistol_mouse.rsi + # state: all + +- type: entity + parent: BaseCartridgeCaselessRifle + id: CMCartridgeSMGBase + abstract: true + components: + - type: CartridgeAmmo + deleteOnSpawn: true + +- type: Tag + id: RMCWeaponSMG + +- type: Tag + id: CMMagazineSmg diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml new file mode 100644 index 00000000000..f6ef9f1d633 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/m63_smg.yml @@ -0,0 +1,256 @@ +- type: entity + parent: CMBaseWeaponSMG + name: M63 submachine gun + id: WeaponSMGM63 + description: The Aegis Battlefield Armaments M-63 submachinegun. Occasionally carried by light-infantry, scouts, engineers and medics. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SMGs/m63/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SMGs/m63/desert.rsi + - type: Gun + shotsPerBurst: 3 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_m63.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 1 + # recoilUnwielded: 1 + # scatterWielded: 14 + # scatterUnwielded: 14 + # baseFireRate: 6.667 + # burstScatterMult: 4 + # modifiers: + # Burst: + # fireDelay: 0.0999 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 3 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.75 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineSMGM63 + - CMMagazineSMGM63AP + - CMMagazineSMGM63Ext + - RMCMagazineSMGM63Rubber + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM63StockCollapsible + # whitelist: + # tags: + # - RMCAttachmentM63ArmBrace + # - RMCAttachmentM63Stock + # - RMCAttachmentM63StockCollapsible + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.715, 0.092 + # rmc-aslot-rail: 0.032, 0.155 + # rmc-aslot-stock: -0.81, 0.032 + # rmc-aslot-underbarrel: 0.25, -0.25 + - type: Tag + tags: + - RMCWeaponSMG + - RMCWeaponSMGM63 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/SMGs/m63/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/SMGs/m63/desert.rsi + # Classic: _RMC14/Objects/Weapons/Guns/SMGs/m63/classic.rsi + # Snow: _RMC14/Objects/Weapons/Guns/SMGs/m63/snow.rsi + # Urban: _RMC14/Objects/Weapons/Guns/SMGs/m63/urban.rsi + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineSMGM63 + name: "M63 magazine (10x20mm)" + components: + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGM63 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridge10x20mm + proto: CMCartridge10x20mm + capacity: 48 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m63.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMMagazineSMGM63 + id: CMMagazineSMGM63AP + name: "M63 AP magazine (10x20mm)" + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridge10x20mmAP + proto: CMCartridge10x20mmAP + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m63.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: ammo_band + color: "#1F951F" + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGM63AP + +- type: entity + parent: CMMagazineSMGM63 + id: CMMagazineSMGM63Ext + name: "M63 extended magazine (10x20mm)" + components: + - type: BallisticAmmoProvider + capacity: 72 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m63e.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGM63Ext + +- type: entity + parent: CMCartridgeSMGBase + id: CMCartridge10x20mm + name: cartridge (10x20mm) + components: + - type: Tag + tags: + - Cartridge + - CMCartridge10x20mm + - type: CartridgeAmmo + proto: Bullet10x20mm + +- type: entity + parent: CMCartridge10x20mm + id: CMCartridge10x20mmAP + name: AP cartridge (10x20mm) + components: + - type: Tag + tags: + - Cartridge + - CMCartridge10x20mmAP + - type: CartridgeAmmo + proto: Bullet10x20mmAP + +- type: entity + parent: RMCBaseBullet + id: Bullet10x20mm + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 34 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 4 + # falloff: 6 + # - type: CMArmorPiercing + # amount: 5 + # - type: RMCProjectileAccuracy + # accuracy: 100 + # thresholds: + # - range: 4 + # falloff: 10 + +- type: entity + parent: Bullet10x20mm + id: Bullet10x20mmAP + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 26 + # - type: CMArmorPiercing + # amount: 30 + +- type: Tag + id: RMCWeaponSMGM63 + +- type: Tag + id: CMMagazineSMGM63 + +- type: Tag + id: CMMagazineSMGM63AP + +- type: Tag + id: CMMagazineSMGM63Ext + +- type: Tag + id: CMCartridge10x20mmAP diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml new file mode 100644 index 00000000000..1f6cf4aee4e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/mp5_smg.yml @@ -0,0 +1,146 @@ +- type: entity + parent: CMBaseWeaponSMG + name: MP5 submachine gun + id: WeaponSMGMP5 # TODO RMC14 10% chance to have an underbarrel grenade launcher + description: A German design, this was one of the most widely used submachine guns in the world. It's still possible to find this firearm in the hands of collectors or gun fanatics. + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SMGs/mp5.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SMGs/mp5.rsi + - type: Gun + shotsPerBurst: 3 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/smg_light.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 1 + # recoilUnwielded: 1 + # scatterWielded: 6 + # scatterUnwielded: 12 + # baseFireRate: 4 + # burstScatterMult: 3 + # modifiers: + # Burst: + # fireDelay: 0.0999 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 3 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.2 + # accuracyMultiplierUnwielded: 0.8 + - type: MagazineAmmoProvider + autoEject: false + soundAutoEject: null + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: CMMagazineSMGMP5 + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineSMGMP5 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentBarrelCharger + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCAttachmentSuppressor + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentLaserSight + # - RMCAttachmentBipod + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.84, 0 + # rmc-aslot-rail: 0.032, 0.09 + # rmc-aslot-underbarrel: 0.45, -0.31 + - type: GunDamageModifier + multiplier: 1.2 + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineSMGMP5 + name: "MP5 magazine (9mm)" + description: "A 9mm magazine for the MP5." + components: + - type: Tag + tags: + - CMMagazineSmg + - CMMagazineSMGMP5 + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridge9mmSMG + proto: CMCartridge9mmSMG + capacity: 30 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/mp5.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMCartridge10x20mm + id: CMCartridge9mmSMG + name: cartridge (9mm SMG) + description: A 9mm cartridge for the mp5 submachinegun. + components: + - type: Tag + tags: + - Cartridge + - CMCartridge9mmSMG + - type: CartridgeAmmo + proto: CMBullet9mmSMG + +- type: entity + parent: Bullet10x20mm + id: CMBullet9mmSMG #Yes it does use a seperate type of 9mm thats mechanically identical to 10x20mm for some reason + +- type: Tag + id: CMMagazineSMGMP5 + +- type: Tag + id: CMCartridge9mmSMG diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml new file mode 100644 index 00000000000..f97e7c739cd --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SMGs/nailgun.yml @@ -0,0 +1,131 @@ +- type: entity + parent: CMBaseWeaponSMG + name: nailgun + id: WeaponNailgun + description: A carpentry tool, used to drive nails into tough surfaces. Of course, if there isn't anything there, that's just a very sharp nail launching at high velocity... + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SMGs/nailgun.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SMGs/nailgun.rsi + - type: Item + size: Normal + - type: Gun + shotsPerBurst: 3 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/nailgun_fire.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # - FullAuto + # recoilWielded: 1 + # recoilUnwielded: 1 + # scatterWielded: 6 + # scatterUnwielded: 12 + # baseFireRate: 2.4 + # burstScatterMult: 3 + # modifiers: + # Burst: + # fireDelay: 0.0999 + # maxScatterModifier: 10 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 6 + # FullAuto: + # maxScatterModifier: 3 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 4 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.25 + # accuracyMultiplierUnwielded: 1.2 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineSMGNailgun + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/smg_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineSMGNailgun + - type: GunDamageModifier + multiplier: 1.2 + # - type: Nailgun + +- type: entity + parent: BaseMagazineRifle + id: RMCMagazineSMGNailgun + name: "nailgun magazine (7x45mm)" + description: "A large magazine of oversized plasteel nails. Unfortunately, the production cost of those nail makes them ill-affordable for most military projects, and only some specific construction projects requires them." + components: + - type: Tag + tags: + - CMMagazineSmg + - RMCMagazineSMGNailgun + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCCartridge7x45mm + proto: RMCCartridge7x45mm + capacity: 48 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/nailgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMCartridgeSMGBase + id: RMCCartridge7x45mm + name: nail (7x45mm) + components: + - type: Tag + tags: + - Cartridge + - RMCCartridge7x45mm + - type: CartridgeAmmo + proto: Nail7x45mm + +- type: entity + parent: RMCBaseBullet + id: Nail7x45mm + components: + - type: Projectile + damage: + types: + Piercing: 25 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 22 + # falloff: 9999 + # ignoreModifiers: true + # - range: 4 + # falloff: 6 + # - type: CMArmorPiercing + # amount: 25 + # - type: RMCProjectileAccuracy + # accuracy: 100 + # thresholds: + # - range: 5 + # falloff: 10 + +- type: Tag + id: RMCMagazineSMGNailgun diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml new file mode 100644 index 00000000000..f02cb6d9230 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml @@ -0,0 +1,131 @@ +- type: entity + abstract: true + parent: [ BaseItem, CMBaseWeaponGun, RMCBaseAttachableHolder ] + id: RMCBaseWeaponShotgun + components: + - type: Item + size: Large + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + slots: + - Back + - SuitStorage + - type: Wieldable + - type: WieldDelay + baseDelay: 0.6 + # - type: WieldableSpeedModifiers + # base: 0.666 + # light: 0.921 + # medium: 0.865 + # heavy: 0.865 + - type: AmmoCounter + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 1.429 + # burstScatterMult: 5 + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCShellShotgun + capacity: 9 + proto: null + soundInsert: + collection: CMShotgunLoad + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + # - type: RMCAmmoEject + # containerID: ballistic-ammo + # ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m42a2.ogg + - type: StaticPrice + price: 500 + # - type: RMCNameItemOnVend + # item: PrimaryGun + - type: Tag + tags: + - RMCWeaponShotgun + # - type: RMCFireGroup + # group: Shotgun + # delay: 4 + # - type: GunDualWielding + # weaponGroup: Shotgun + # - type: GunPointBlank + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.15 + # accuracyMultiplierUnwielded: 0.95 + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/shotgun_mouse.rsi + # state: all + +- type: entity + abstract: true + parent: RMCBaseWeaponShotgun + id: RMCBaseBreechloader + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: BallisticAmmoProvider + cycleable: true + capacity: 2 + soundInsert: + path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + params: + volume: -2 + # - type: UniqueAction + # - type: BreechLoaded + # needOpenClose: false + +- type: entity + abstract: true + parent: BaseCartridge + id: CMShellShotgunBase + name: handful of shotgun shell + description: A handful of rounds to reload on the go. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: buckshot_shell_1 + - type: Item + size: Small + - type: CartridgeAmmo + proto: CMPelletShotgunBuckshot + deleteOnSpawn: true + soundEject: + collection: ShellEject + soundInsert: + collection: CMShotgunLoad + - type: Tag + tags: + - Cartridge + - RMCShellShotgun + - type: Appearance + - type: StaticPrice + price: 0 + +- type: Tag + id: RMCWeaponShotgun diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml new file mode 100644 index 00000000000..a5af5cc8dee --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/custombuilt.yml @@ -0,0 +1,61 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: custom built shotgun + id: WeaponShotgunCustomBuilt + description: A cobbled-together pile of scrap and alien wood. Point end towards things you want to die. Has a burst fire feature, as if it needed it. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/custombuilt.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/custombuilt.rsi + slots: + - suitStorage + - belt + - type: Gun + shotsPerBurst: 2 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 0.85 + # burstScatterMult: 4 + - type: GunDamageModifier + multiplier: 1 + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCShellShotgun + capacity: 6 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentAngledGrip + # - RMCAttachmentVerticalGrip + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.780, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-underbarrel: 0.30, -0.31 + +# Theres a damaged version of this with worse stats, make sure to use the "busted" state as the base/icon for it diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml new file mode 100644 index 00000000000..22b048039cf --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_sawn_off_shotgun.yml @@ -0,0 +1,49 @@ +- type: entity + parent: [ WeaponShotgunM357, RMCBaseAttachableHolder ] + name: Sawn-Off M357 Rival + id: WeaponShotgunM357Sawn + description: A double barrel shotgun produced by Aegis. Archaic, sturdy, affordable. It has been artificially shortened to reduce range but increase damage and spread. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/dbsawnoff.rsi + - type: Item + size: Normal + - type: GunDamageModifier + multiplier: 0.80 + # - type: RMCExtraProjectilesDamageMods + # damageMultiplier: 1.5 + # - type: RMCWeaponDamageFalloff + # falloffMultiplier: 2 # Adjust as needed + # - type: RMCSelectiveFire + # recoilWielded: 3 + # recoilUnwielded: 5 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 2 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 0.9 + # accuracyMultiplierUnwielded: 0.95 + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentDoubleBarrelShotgunStock + # whitelist: + # tags: + # - RMCAttachmentDoubleBarrelShotgunStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: -0.025, 0.09 + # rmc-aslot-stock: -0.55, -0.05 + # rmc-aslot-underbarrel: 0.25, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml new file mode 100644 index 00000000000..4fa9721f983 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m357_shotgun.yml @@ -0,0 +1,62 @@ +- type: entity + parent: [ RMCBaseBreechloader, RMCBaseAttachableHolder ] + name: M357 Rival + id: WeaponShotgunM357 + description: A double barrel shotgun produced by Aegis. Archaic, sturdy, affordable. Only holds two 12g shells at a time. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/doublebarrel.rsi + - type: Gun + shotsPerBurst: 2 + # - type: ShootUseDelay + - type: BallisticAmmoProvider + cycleable: true + whitelist: + tags: + - RMCShellShotgun + capacity: 2 + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - Burst + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 20 + # baseFireRate: 2 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.15 + # accuracyMultiplierUnwielded: 0.95 + # - type: Construction + # graph: M357Sawn + # node: start + # deconstructionTarget: null + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentDoubleBarrelShotgunStock + # whitelist: + # tags: + # - RMCAttachmentDoubleBarrelShotgunStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, 0.06 + # rmc-aslot-rail: -0.025, 0.09 + # rmc-aslot-stock: -0.55, -0.05 + # rmc-aslot-underbarrel: 0.25, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml new file mode 100644 index 00000000000..43131fa6d2a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_riotshotgun.yml @@ -0,0 +1,59 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: M890 tactical riot shotgun + id: RMCWeaponShotgunM890Riot + description: A unique corporate made semi-automatic riot shotgun with a rapid fire rate. Holds 8 Beanbag shells in the chamber. Specially made for crowd control during tough situations. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Gun + shotsPerBurst: 1 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 5 + # scatterUnwielded: 10 + # baseFireRate: 0.7 + # burstScatterMult: 5 + # - type: BallisticAmmoProvider + # cycleable: false + # whitelist: + # tags: + # - RMCShellShotgunBeanbag + # capacity: 8 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM890Stock + # whitelist: + # tags: + # - RMCAttachmentM890Stock + # rmc-aslot-underbarrel: + # locked: true + # startingAttachable: RMCAttachmentU1GrenadeLauncher + # whitelist: + # tags: + # - RMCAttachmentU1GrenadeLauncher + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.825, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-stock: -0.50, 0.065 + # rmc-aslot-underbarrel: 0.30, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml new file mode 100644 index 00000000000..0e3a376d818 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/m890_shotgun.yml @@ -0,0 +1,60 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: M890 tactical shotgun + id: WeaponShotgunM890 + description: A unique corporate made semi-automatic shotgun with a rapid fire rate and an attached Underslung Grenade Launcher. Holds 8 shotgun shells in the chamber. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m890.rsi + - type: Gun + shotsPerBurst: 1 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 5 + # scatterUnwielded: 10 + # baseFireRate: 0.7 + # burstScatterMult: 5 + - type: BallisticAmmoProvider + cycleable: false + whitelist: + tags: + - RMCShellShotgun + capacity: 8 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # startingAttachable: RMCAttachmentM890Stock + # whitelist: + # tags: + # - RMCAttachmentM890Stock + # rmc-aslot-underbarrel: + # locked: true + # startingAttachable: RMCAttachmentU1GrenadeLauncher + # whitelist: + # tags: + # - RMCAttachmentU1GrenadeLauncher + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.825, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-stock: -0.50, 0.065 + # rmc-aslot-underbarrel: 0.30, -0.31 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml new file mode 100644 index 00000000000..38ea58fdf6e --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/mou53_shotgun.yml @@ -0,0 +1,85 @@ +- type: entity + parent: [ RMCBaseBreechloader, RMCBaseAttachableHolder ] + name: MOU53 break action shotgun + id: WeaponShotgunMOU53 + description: A limited production Kerchner MOU53 triple break action classic. Respectable damage output at medium ranges, while the Aegis M42 is the king of CQC, the Kerchner MOU53 is what hits the broadside of that barn. This specific model cannot safely fire buckshot shells. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/jungle.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/jungle.rsi + - type: Tag + tags: + - RMCWeaponShotgunMOU53 + - type: Gun + shotsPerBurst: 1 + - type: Appearance + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 9 + # scatterUnwielded: 18 + # baseFireRate: 2 + # burstScatterMult: 1 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1 + # accuracyMultiplierUnwielded: 0.95 + # - type: BallisticAmmoProvider + # cycleable: true + # whitelist: + # tags: + # - RMCShellShotgunSlugs + # - RMCShellShotgunIncendiary + # - RMCShellShotgunBeanbag + # - RMCShellShotgunFlechette + # proto: CMShellShotgunSlugs + # capacity: 3 #It's a lovely triple barrel + # soundInsert: + # path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg + # params: + # volume: -2 + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentS42xTelescopicMiniscope + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentMOU53Stock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentAngledGrip + # - RMCAttachmentVerticalGrip + # - RMCAttachmentLaserSight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.8, 0.06 + # rmc-aslot-rail: -0.02, 0.15 + # rmc-aslot-stock: -0.65, -0.18 + # rmc-aslot-underbarrel: 0.5, -0.25 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Shotguns/mou53/urban.rsi + +- type: Tag + id: RMCWeaponShotgunMOU53 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml new file mode 100644 index 00000000000..4f6158c7329 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/pump_shotgun.yml @@ -0,0 +1,69 @@ +- type: entity + parent: [ RMCBaseWeaponShotgun, RMCBaseAttachableHolder ] + name: M42A2 Pump Shotgun + id: WeaponShotgunM42A2 + description: An Aegis Battlefield Armaments classic design, the M42A2 combines close-range firepower with long term reliability. Needs to be pumped. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/desert.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/desert.rsi + - type: Gun + shotsPerBurst: 1 + # - type: ShootUseDelay + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 10 + # baseFireRate: 0.5 + # burstScatterMult: 5 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.15 + # accuracyMultiplierUnwielded: 0.95 + # - type: PumpAction + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCAttachmentExtendedBarrel + # - RMCAttachmentBarrelCharger + # - RMCAttachmentRecoilCompensator + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentM42A2WoodenStock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentAngledGrip + # - RMCAttachmentFlashlightGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentVerticalGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.81, 0.06 + # rmc-aslot-rail: -0.025, 0.125 + # rmc-aslot-stock: -0.375, -0.029 + # rmc-aslot-underbarrel: 0.25, -0.31 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Shotguns/m42a2/urban.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml new file mode 100644 index 00000000000..643ea01d825 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_boxes.yml @@ -0,0 +1,180 @@ +- type: entity + abstract: true + parent: BaseStorageItem + id: RMCBoxShotgunBase + name: box of shotgun shells + components: + - type: Item + size: Large + - type: Storage + grid: + - 0,0,9,1 # 5 slots + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Boxes/shotgun_boxes.rsi + - type: Appearance + - type: Tag + tags: + - RMCBoxShotgunShells + # - type: InteractedBlacklist + # blacklist: + # components: + # - Xeno + # - type: CMStorageVisualizer + # storageEmpty: empty + # - type: RMCStorageEjectHand + +- type: Tag + id: RMCBoxShotgunShells + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunBuckshot + name: box of buckshot shells + description: A box filled with buckshot spread shotgun shells. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunBuckshot + - type: StorageFill + contents: + - id: CMShellShotgunBuckshot + amount: 5 + - type: Sprite + layers: + - state: buckshot + map: [ "full" ] + - state: buckshot_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunSlugs + name: box of shotgun slugs + description: A box filled with heavy shotgun shells. A timeless classic. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunSlugs + - type: StorageFill + contents: + - id: CMShellShotgunSlugs + amount: 5 + - type: Sprite + layers: + - state: slugs + map: [ "full" ] + - state: slugs_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunIncendiary + name: box of incendiary slugs + description: A box filled with self-detonating incendiary shotgun rounds. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunIncendiary + - type: StorageFill + contents: + - id: CMShellShotgunIncendiary + amount: 5 + - type: Sprite + layers: + - state: incendiary + map: [ "full" ] + - state: incendiary_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunBeanbag + name: box of beanbag slugs + description: A box filled with beanbag shotgun shells used for non-lethal crowd control. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunBeanbag + - type: StorageFill + contents: + - id: CMShellShotgunBeanbag + amount: 5 + - type: Sprite + layers: + - state: beanbag + map: [ "full" ] + - state: beanbag_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunFlechette + name: box of flechette shells + description: A box filled with flechette shotgun shells. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunFlechette + - type: StorageFill + contents: + - id: CMShellShotgunFlechette + amount: 5 + - type: Sprite + layers: + - state: flechette + map: [ "full" ] + - state: flechette_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunIncendiaryBuckshot + name: box of incendiary buckshots + description: A box filled with self-detonating buckshot incendiary shotgun rounds. 12 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunIncendiaryBuckshot + - type: StorageFill + contents: + - id: CMShellShotgunIncendiaryBuckshot + amount: 5 + - type: Sprite + layers: + - state: incendiarybuck + map: [ "full" ] + - state: incendiarybuck_e + map: [ "empty" ] + +- type: entity + parent: RMCBoxShotgunBase + id: RMCBoxShotgunBreaching + name: box of breaching shells + description: A box filled with breaching shotgun shells. 16 Gauge. + components: + - type: Storage + whitelist: + tags: + - RMCShellShotgunBreaching + - type: StorageFill + contents: + - id: RMCShellShotgunBreaching + amount: 5 + - type: Sprite + layers: + - state: breaching + map: [ "full" ] + - state: breaching_e + map: [ "empty" ] + - type: Tag + tags: + - RMCBoxShotgunBreaching + +- type: Tag + id: RMCBoxShotgunBreaching diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml new file mode 100644 index 00000000000..20409eca04b --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml @@ -0,0 +1,286 @@ +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunBuckshot + name: handful of buckshot shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: buckshot_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunBuckshot + - type: Stack + count: 5 + stackType: RMCShellShotgunBuckshot + baseLayer: base + layerStates: + - buckshot_shell_1 + - buckshot_shell_1 + - buckshot_shell_2 + - buckshot_shell_3 + - buckshot_shell_4 + - buckshot_shell_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunBuckshot + +- type: stack + id: RMCShellShotgunBuckshot + name: handful of buckshot shells + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: buckshot_shell_1 } + spawn: CMShellShotgunBuckshot + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: RMCShellShotgunBreaching + name: handful of breaching shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: breaching_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: RMCPelletShotgunBreaching + - type: Stack + count: 6 + stackType: RMCShellShotgunBreaching + baseLayer: base + layerStates: + - breaching_shell_1 + - breaching_shell_1 + - breaching_shell_2 + - breaching_shell_3 + - breaching_shell_4 + - breaching_shell_5 + - breaching_shell_6 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunBreaching + +- type: stack + id: RMCShellShotgunBreaching + name: handful of breaching shells + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: breaching_shell_1 } + spawn: RMCShellShotgunBreaching + maxCount: 6 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunSlugs + name: handful of shotgun slugs + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: slug_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunSlug + - type: Stack + count: 5 + stackType: RMCShellShotgunSlug + baseLayer: base + layerStates: + - slug_shell_1 + - slug_shell_1 + - slug_shell_2 + - slug_shell_3 + - slug_shell_4 + - slug_shell_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunSlugs + +- type: stack + id: RMCShellShotgunSlug + name: handful of shotgun slugs + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: slug_shell_1 } + spawn: CMShellShotgunSlugs + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunIncendiary + name: handful of incendiary slugs + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: incendiary_slug_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunIncendiary + - type: Stack + count: 5 + stackType: RMCShellShotgunIncendiary + baseLayer: base + layerStates: + - incendiary_slug_1 + - incendiary_slug_1 + - incendiary_slug_2 + - incendiary_slug_3 + - incendiary_slug_4 + - incendiary_slug_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunIncendiary + +- type: stack + id: RMCShellShotgunIncendiary + name: handful of incendiary slugs + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: incendiary_slug_1 } + spawn: CMShellShotgunIncendiary + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunBeanbag + name: handful of beanbag slugs + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: beanbag_slug_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunBeanbag + - type: Stack + count: 5 + stackType: RMCShellShotgunBeanbag + baseLayer: base + layerStates: + - beanbag_slug_1 + - beanbag_slug_1 + - beanbag_slug_2 + - beanbag_slug_3 + - beanbag_slug_4 + - beanbag_slug_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunBeanbag + +- type: stack + id: RMCShellShotgunBeanbag + name: handful of beanbag slugs + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: beanbag_slug_1 } + spawn: CMShellShotgunBeanbag + maxCount: 5 + +- type: entity + parent: CMShellShotgunBase + id: CMShellShotgunFlechette + name: handful of flechette shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: flechette_shell_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunFlechette + - type: Stack + count: 5 + stackType: RMCShellShotgunFlechette + baseLayer: base + layerStates: + - flechette_shell_1 + - flechette_shell_1 + - flechette_shell_2 + - flechette_shell_3 + - flechette_shell_4 + - flechette_shell_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunFlechette + +- type: stack + id: RMCShellShotgunFlechette + name: handful of flechette shells + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: flechette_shell_1 } + spawn: CMShellShotgunFlechette + maxCount: 5 + +- type: entity + parent: CMShellShotgunBuckshot + id: CMShellShotgunIncendiaryBuckshot + name: handful of incendiary buckshot shells + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi + layers: + - state: incen_buckshot_1 + map: [ "base" ] + - type: CartridgeAmmo + proto: CMPelletShotgunIncendiaryBuckshot + - type: Stack + count: 5 + stackType: RMCShellShotgunIncendiaryBuckshot + baseLayer: base + layerStates: + - incen_buckshot_1 + - incen_buckshot_1 + - incen_buckshot_2 + - incen_buckshot_3 + - incen_buckshot_4 + - incen_buckshot_5 + - type: Tag + tags: + - RMCHandful + - Cartridge + - RMCShellShotgun + - RMCShellShotgunIncendiaryBuckshot + +- type: stack + id: RMCShellShotgunIncendiaryBuckshot + name: handful of incendiary buckshot shells + icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: incen_buckshot_1 } + spawn: CMShellShotgunIncendiaryBuckshot + maxCount: 5 + +- type: Tag + id: RMCHandful + +- type: Tag + id: RMCShellShotgun + +- type: Tag + id: RMCShellShotgunBuckshot + +- type: Tag + id: RMCShellShotgunSlugs + +- type: Tag + id: RMCShellShotgunIncendiary + +- type: Tag + id: RMCShellShotgunBeanbag + +- type: Tag + id: RMCShellShotgunFlechette + +- type: Tag + id: RMCShellShotgunIncendiaryBuckshot + +- type: Tag + id: RMCShellShotgunBreaching diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml new file mode 100644 index 00000000000..c02ab5c91cc --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml @@ -0,0 +1,182 @@ +- type: entity + abstract: true + parent: CMBulletBase + id: CMPelletShotgunBase + categories: + - HideSpawnMenu + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded + - type: Projectile + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunBuckshot + name: buckshot + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: buckshot + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 65 + - type: ProjectileSpread + proto: CMPelletShotgunBuckshot + count: 4 + spread: 20 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 4 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + # - type: RMCProjectileAccuracy + # thresholds: + # - range: 4 + # falloff: 10 + # - type: RMCStunOnHit + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunSlug + name: slug + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: beanbag + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 70 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 8 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + # - type: CMArmorPiercing + # amount: 20 + # - type: RMCStunOnHit + # maxRange: 6.5 + # stunTime: 1 + # superSlowTime: 2 + # slowTime: 6 + # - type: RMCProjectileAccuracy + # accuracy: 100 + # thresholds: + # - range: 8 + # falloff: 10 + +- type: entity + parent: CMPelletShotgunSlug + id: CMPelletShotgunIncendiary + name: incendiary slug + components: + - type: Projectile + damage: + types: + Heat: 55 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + # - type: RMCProjectileAccuracy + # accuracy: 95 + - type: IgniteOnProjectileHit + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunBeanbag + name: beanbag slug + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: beanbag + shader: unshaded + - type: Projectile + damage: {} + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + - type: StaminaDamageOnCollide + damage: 45 + # - type: RMCProjectileAccuracy + # accuracy: 100 + +- type: entity + parent: CMPelletShotgunBase + id: CMPelletShotgunFlechette + name: flechette shell + components: + # - type: CMArmorPiercing + # amount: 35 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: flechette + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 30 + - type: ProjectileSpread + proto: CMPelletShotgunFlechette + count: 4 + spread: 15 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 0 + # falloff: 1 + +- type: entity + parent: CMPelletShotgunBuckshot + id: CMPelletShotgunIncendiaryBuckshot + name: incendiary buckshot shell + components: + - type: ProjectileSpread + proto: CMPelletShotgunIncendiaryBuckshot + count: 4 + spread: 20 + - type: IgniteOnProjectileHit + +- type: entity + parent: CMPelletShotgunBase + id: RMCPelletShotgunBreaching + name: light breaching shell + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun_projectiles.rsi + layers: + - state: flechette + shader: unshaded + - type: Projectile + damage: + types: + Blunt: 55 + # - type: CMArmorPiercing + # amount: 5 + - type: ProjectileSpread + proto: RMCPelletShotgunBreaching + count: 4 + spread: 16 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml new file mode 100644 index 00000000000..9f4ecc71768 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/xm51_shotgun.yml @@ -0,0 +1,106 @@ +- type: entity + parent: [ CMBaseWeaponRifleNoDualWieldPenalty, RMCBaseAttachableHolder ] + name: XM51 breaching scattergun + id: RMCWeaponShotgunXM51 + description: An experimental shotgun model going through testing trials in the UNMC. Based on the original civilian and CMB version, the XM51 is a mag-fed, pump-action shotgun. It utilizes special 16-gauge breaching rounds which are effective at breaching walls and doors. Users are advised not to employ the weapon against soft or armored targets due to low performance of the shells. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/xm51.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Shotguns/xm51.rsi + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: Gun + shotsPerBurst: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_shotgun_xm51.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # recoilWielded: 2 + # recoilUnwielded: 4 + # scatterWielded: 10 + # scatterUnwielded: 30 + # baseFireRate: 0.625 + # - type: RMCExtraProjectilesDamageMods + # damageMultiplier: 0.18 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.8 + # accuracyMultiplierUnwielded: 0.6 + # - type: ItemSlots + # slots: + # gun_magazine: + # name: Magazine + # startingItem: RMCMagazineShotgunXM51 + # insertSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_reload.ogg + # ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/m41_unload.ogg + # priority: 2 + # whitelist: + # tags: + # - RMCMagazineShotgunXM51 + # - type: PumpAction + # - type: AttachableHolder + # slots: + # rmc-aslot-barrel: + # whitelist: + # tags: + # - RMCM5Bayonet + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentS5RedDotSight + # - RMCAttachmentS6ReflexSight + # - RMCAttachmentRailFlashlight + # - RMCAttachmentMagneticHarness + # rmc-aslot-stock: + # whitelist: + # tags: + # - RMCAttachmentXM51Stock + # rmc-aslot-underbarrel: + # whitelist: + # tags: + # - RMCAttachmentVerticalGrip + # - RMCAttachmentAngledGrip + # - RMCAttachmentGyroscopicStabilizer + # - RMCAttachmentFlashlightGrip + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-barrel: 0.75, 0.00 + # rmc-aslot-rail: -0.03125, 0.125 + # rmc-aslot-stock: -0.5625, 0.00 + # rmc-aslot-underbarrel: 0.25, -0.343 + - type: Tag + tags: + - RMCWeaponShotgun + - RMCWeaponShotgunXM51 + # - type: GunDamageMultipliers + # multipliers: + # Turf: 30 + # Breaching: 15 + # Xeno: 0.23 # TODO RMC14 pylon 6 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Shotguns/xm51/urban.rsi + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/shotgun_mouse.rsi + # state: all + +- type: Tag + id: RMCWeaponShotgunXM51 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml new file mode 100644 index 00000000000..7d4f38ebf8b --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml @@ -0,0 +1,241 @@ +- type: entity + parent: [ CMBaseWeaponGun, BaseItem, RMCBaseAttachableHolder ] + id: RMCSmartGun + name: ML66A smart gun + description: The actual firearm in the Smart Gun System. Essentially a heavy, mobile machinegun. + components: + - type: Wieldable + - type: Item + size: Huge + - type: AmmoCounter + - type: StaticPrice + price: 500 + - type: MagazineAmmoProvider + autoEject: true + # - type: RMCAmmoEject + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + # - type: RMCNameItemOnVend + # item: PrimaryGun + - type: GunRequiresWield + - type: Corrodible + isCorrodible: false + # - type: GunIFF + # enabled: true + - type: WieldDelay + baseDelay: 0.4 + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/jungle.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/jungle.rsi + slots: + - suitStorage + - Back + - type: MeleeWeapon + damage: + types: + Blunt: 20 + - type: Gun + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_ml66a.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + # - type: RMCSelectiveFire + # baseFireModes: + # - FullAuto + # recoilWielded: 3 + # scatterWielded: 10 + # baseFireRate: 5 + # burstScatterMult: 4 + # modifiers: + # FullAuto: + # maxScatterModifier: 4 + # useBurstScatterMult: true + # unwieldedScatterMultiplier: 2 + # shotsToMaxScatter: 80 + # - type: RMCWeaponAccuracy + # accuracyMultiplier: 1.05 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + cell_slot: !type:ContainerSlot { } + - type: PowerCellSlot + cellSlotId: cell_slot + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: RMCMagazineSmartGun + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_sg_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_sg_unload.ogg + priority: 2 + whitelist: + tags: + - RMCMagazineSmartGun + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: RMCPowerCellSmartgun + whitelist: + components: + - SmartGunBattery + - type: GunDamageModifier + multiplier: 1 + # - type: GunToggleableAmmo + # settings: + # - damage: + # types: + # Piercing: 30 + # armorPiercing: 0 + # name: rmc-toggleable-ammo-highly-precise + # icon: + # sprite: _RMC14/Actions/marine_smart_gun_actions.rsi + # state: ammo_swap_normal + # - damage: + # types: + # Piercing: 20 + # armorPiercing: 40 + # name: rmc-toggleable-ammo-armor-shredding + # icon: + # sprite: _RMC14/Actions/marine_smart_gun_actions.rsi + # state: ammo_swap_ap + # - type: RMCMagneticItem + # - type: GunRequiresSkills + # skills: + # RMCSkillSmartGun: 1 + # - type: GunSkilledRecoil + # skills: + # RMCSkillFirearms: 100 + # - type: GunDrainBatteryOnShoot + # - type: GunRequireEquipped + # whitelist: + # components: + # - SmartGunArmor + # - type: GunToggleableRecoil + # - type: GunToggleableAutoFire + # - type: GunToggleableMotionDetector + # - type: IFFToggle + # - type: MotionDetector + # handToggleable: false + # toggleSound: null + # - type: SmartGun + # - type: AttachableHolder + # slots: + # rmc-aslot-rail: + # whitelist: + # tags: + # - RMCAttachmentRailFlashlight + # - type: AttachableHolderVisuals + # offsets: + # rmc-aslot-rail: -0.1875, 0.125 + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/SmartGuns/ml66a/urban.rsi + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/smartgun_mouse.rsi + # state: all + +- type: entity + parent: CMMagazineRifleBase + id: RMCMagazineSmartGun + name: "ML66A drum magazine (10x30mm)" + components: + - type: Tag + tags: + - RMCMagazineSmartGun + - type: BallisticAmmoProvider + whitelist: + tags: + - CMCartridgeSmartGun10x30mm + proto: CMCartridgeSmartGun10x30mm + capacity: 500 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/jungle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + slots: + - suitStorage + # - type: ItemCamouflage + # camouflageVariations: + # Jungle: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/jungle.rsi + # Desert: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/desert.rsi + # Snow: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/snow.rsi + # Classic: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/classic.rsi + # Urban: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/SmartGuns/magazine_smart_gun/urban.rsi + +- type: entity + parent: CMBaseCartridgeRifle + id: CMCartridgeSmartGun10x30mm + name: cartridge (10x30mm) + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: CartridgeAmmo + proto: CMBulletSmartGun10x30mm + - type: Tag + tags: + - CMCartridgeSmartGun10x30mm + +- type: entity + parent: CMBulletBase + id: CMBulletSmartGun10x30mm + name: bullet (10x30mm) + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 30 + # - type: CMArmorPiercing + # amount: 0 + # - type: RMCProjectileDamageFalloff + # thresholds: + # - range: 12 + # falloff: 9999 + # ignoreModifiers: true + # - range: 7 + # falloff: 4 + # - type: RMCProjectileAccuracy + # accuracy: 105 + # thresholds: + # - range: 5 + # falloff: 10 + +- type: Tag + id: RMCMagazineSmartGun + +- type: Tag + id: CMCartridgeSmartGun10x30mm diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml new file mode 100644 index 00000000000..4384ae7dcaf --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml @@ -0,0 +1,55 @@ +- type: entity + abstract: true + parent: [ NFBaseWeaponEncumbranceRifleAssault, NFBaseItemWeaponGunMagazineFed ] + id: RMCBaseWeaponSniperRifle + components: + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + # - type: RMCSelectiveFire + # baseFireModes: + # - SemiAuto + # - type: WieldableSpeedModifiers + # base: 0.5 + # light: 0.69 + # medium: 0.75 + # heavy: 0.806 + - type: WieldDelay + baseDelay: 0.8 + # - type: GunDualWielding + # weaponGroup: Rifle + # - type: GunPointBlank + # - type: WieldedCrosshair + # rsi: + # sprite: _RMC14/Interface/MousePointer/sniper_mouse.rsi + # state: all + +- type: entity + parent: [BaseWeaponSniper, BaseGunWieldable, BaseC3SyndicateContraband] + id: CMCartridgeSniper10x28mm + name: cartridge (145x114mm) + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + # - type: Tag + # tags: + # - Cartridge + # - CMCartridgeSniper10x28mm + # - type: CartridgeAmmo + # proto: CMBulletSniper10x28mm + - type: BallisticAmmoProvider + whitelist: + tags: + - Cartridge145x114mm + capacity: 5 + proto: Cartridge145x114mm + - type: SpeedModifiedOnWield + walkModifier: 0.25 + sprintModifier: 0.25 + +- type: Tag + id: CMMagazineSniper diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml new file mode 100644 index 00000000000..2252715d649 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/m96s_sniper.yml @@ -0,0 +1,237 @@ +- type: entity + parent: RMCBaseWeaponSniperRifle + id: CMM96SSniperRifle + name: M96S scoped rifle + description: "A heavy sniper rifle manufactured by Aegis Armaments. It has a scope system and fires armor penetrating rounds out of a 15-round magazine. + 'Peace Through Superior Firepower'" + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Snipers/m96s/desert.rsi + layers: + - state: bolt-open + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - sprite: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + state: sniperbarrel + offset: 0.715, 0.025 + - type: Item + size: Large + - type: Clothing + sprite: _RMC14/Objects/Weapons/Guns/Snipers/m96s/desert.rsi + - type: Tag + tags: + - CMM96SSniperRifle + - type: MeleeWeapon + damage: + types: + Blunt: 12 + - type: Gun + shotsPerBurst: 1 + soundGunshot: + path: /Audio/_RMC14/Weapons/Guns/Gunshots/gun_sniper.ogg + - type: WieldDelay + baseDelay: 1.2 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mar40_reload.ogg + ejectSound: /Audio/_RMC14/Weapons/Guns/Reload/gun_mar40_unload.ogg + priority: 2 + whitelist: + tags: + - CMMagazineSniperM96S + - type: GunRequiresWield + - type: Corrodible + isCorrodible: false + +- type: entity + parent: BaseMagazineRifle + id: CMMagazineSniperM96S + name: "M96S marksman magazine (10x28mm)" + description: A magazine of sniper rifle ammo. An aimed shot with it will deal significant damage. + components: + - type: Tag + tags: + - CMMagazineSniper + - CMMagazineSniperM96S + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeSniper10x28mm + proto: CMCartridgeSniper10x28mm + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + zeroOnlyOnEmpty: true + - type: Appearance + +- type: entity + parent: CMMagazineSniperM96S + id: CMMagazineSniperM96SIncendiary + name: "M96S incendiary magazine (10x28mm)" + description: A magazine of sniper rifle ammo. An aimed shot with it will temporarily blind the targe and kindle the blaze further. + components: + - type: BallisticAmmoProvider + proto: CMCartridgeSniper10x28mmIncendiary + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: band_e # TODO RMC14 band non e + color: "#9C2219" + +- type: entity + parent: CMMagazineSniperM96S + id: CMMagazineSniperM96SFlak + name: "M96S flak magazine (10x28mm)" + description: A magazine of sniper rifle ammo. An aimed shot with it will temporarily slow the target and minimize the backlash. + components: + - type: BallisticAmmoProvider + proto: CMCartridgeSniper10x28mmFlak + capacity: 15 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: band_e # TODO RMC14 band non e + color: "#7866FF" + +- type: entity + parent: CMMagazineSniperM96S + id: CMMagazineSniperM96SAntiMateriel + name: "XM43E1 marksman magazine (10x99mm)" + description: A magazine of 10x99mm anti-materiel rounds. + components: + - type: Tag + tags: + - CMMagazineSniper + - type: BallisticAmmoProvider + mayTransfer: True + whitelist: + tags: + - CMCartridgeSniper10x99mm + proto: CMCartridgeSniper10x99mmAntiMateriel + capacity: 8 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/m42c.rsi + layers: + - state: mag-0 + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: band_e # TODO RMC14 band non e + color: "#000000" + +- type: entity + parent: CMCartridgeSniper10x28mm + id: CMCartridgeSniper10x28mmIncendiary + name: cartridge (10x28mm) (incendiary) + components: + - type: CartridgeAmmo + proto: CMBulletSniper10x28mmIncendiary + +- type: entity + parent: CMCartridgeSniper10x28mm + id: CMCartridgeSniper10x28mmFlak + name: cartridge (10x28mm) (Flak) + components: + - type: CartridgeAmmo + proto: CMBulletSniper10x28mmFlak + +- type: entity + parent: CMCartridgeSniper10x28mm + id: CMCartridgeSniper10x99mmAntiMateriel + name: cartridge (10x99mm) (AntiMateriel) + components: + - type: Tag + tags: + - Cartridge + - CMCartridgeSniper10x99mm + - type: CartridgeAmmo + proto: CMBulletSniper10x99mmAntiMateriel + +- type: entity + parent: RMCBaseBullet + id: CMBulletSniper10x28mm + name: bullet (10x28mm) + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 140 # TODO RMC14 70 when aimed shot is in please someone help im dying + + +- type: entity + parent: CMBulletSniper10x28mm + id: CMBulletSniper10x28mmIncendiary + name: bullet (10x28mm) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 100 # TODO RMC14 50 when aimed shot is in please someone help im dying + Heat: 20 # TODO RMC14 10 when aimed shot is in please someone help im dying + + +# TODO RMC14 slow +- type: entity + parent: CMBulletSniper10x28mm + id: CMBulletSniper10x28mmFlak + name: bullet (10x28mm) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 55 + + +- type: entity + parent: CMBulletSniper10x28mm + id: CMBulletSniper10x99mmAntiMateriel + name: bullet (10x99mm) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 125 + + +- type: Tag + id: CMM96SSniperRifle + +- type: Tag + id: CMMagazineSniperM96S + +- type: Tag + id: CMCartridgeSniper10x28mm + +- type: Tag + id: CMCartridgeSniper10x99mm diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml new file mode 100644 index 00000000000..a803e7b0b0d --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml @@ -0,0 +1,38 @@ +- type: entity + abstract: true + parent: NFBaseItemWeaponGun + id: CMBaseWeaponGun + components: + - type: Clothing + quickEquip: false + - type: UseDelay + delay: 0 + - type: WieldDelay + - type: AltFireMelee + - type: MeleeWeapon + attackRate: 1 + damage: + types: + Blunt: 5 + soundHit: + collection: GenericHit + - type: EmitSoundOnPickup + sound: + collection: RMCEquipGun + - type: EmitSoundOnLand + sound: + collection: RMCRustleGun + - type: Gun + meleeCooldownOnShoot: false + resetOnHandSelected: false + - type: Appearance + +- type: entity + parent: BaseBullet + id: RMCBaseBullet + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/bullet_projectiles.rsi + layers: + - state: bullet + shader: unshaded diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml new file mode 100644 index 00000000000..89fdaa2562a --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -0,0 +1,25 @@ +- type: entity + parent: [FireAxe, RMCBaseMeleeWeapon] + id: RMCFireAxe + name: fire axe + suffix: RMC + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/fireaxe.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Melee/fireaxe.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 15 + Slash: 10 + soundHit: + collection: GenericHit + wideAnimationRotation: 90 + - type: IncreaseDamageOnWield + damage: + types: + Slash: 10 + Blunt: 10 + - type: Prying + speedModifier: 100000 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml new file mode 100644 index 00000000000..d3c074176c6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml @@ -0,0 +1,32 @@ +- type: entity + parent: Flash + id: CMFlash + name: flash + description: Used for blinding and being an asshole. Recharges one flash every 30 seconds. You must wait 1 second between uses for the capacitor to recharge. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/flash.rsi + - type: Item + size: Small + sprite: _RMC14/Objects/Weapons/Melee/flash.rsi + - type: LimitedCharges + maxCharges: 5 + charges: 5 + - type: AutoRecharge + rechargeDuration: 30 + - type: UseDelay + delay: 0.5 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.FlashVisuals.Burnt: + enum.FlashVisuals.BaseLayer: + True: { state: burnt } + False: { state: flash } + enum.FlashVisuals.Flashing: + enum.FlashVisuals.LightLayer: + True: { visible: true } + False: { visible: false } + # - type: MeleeRequiresSkill + # skills: + # RMCSkillPolice: 1 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml new file mode 100644 index 00000000000..5d668b01883 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/kitchen.yml @@ -0,0 +1,59 @@ +- type: entity + parent: [ RMCBaseMeleeWeapon, BaseKnife ] + id: RMCKitchenKnife + name: knife + description: Can cut through any food. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/Kitchen/knife.rsi + state: icon + - type: Item + size: Small + - type: Clothing + slots: + - mask + - pocket + - suitstorage + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Slash: 10 + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + # - type: DisarmMalus + # malus: 0.225 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 10 + - type: Tag + tags: + - Knife + +- type: entity + parent: RMCKitchenKnife + id: RMCKitchenKnifePlastic + name: plastic knife + description: The bluntest of blades. + components: + - type: Sprite + state: plastic + +- type: entity + parent: RMCKitchenKnife + id: RMCKitchenKnifeChef + name: kitchen knife + description: A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come. + +- type: entity + parent: RMCKitchenKnife + id: RMCKitchenKnifeButcher + name: butcher's cleaver + description: A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/Kitchen/cleaver.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml new file mode 100644 index 00000000000..838056826c6 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/knife.yml @@ -0,0 +1,143 @@ +- type: entity + abstract: true + id: RMCBaseMeleeWeapon + # components: + # - type: MeleeDamageMultiplier + # whitelist: + # components: + # - Xeno + +- type: entity + parent: [ RMCBaseMeleeWeapon, BaseKnife, RMCAttachableBase ] + id: RMCM5Bayonet + name: "M5 'Night Raider' bayonet" + description: The standard-issue bayonet of the Marines. You can slide this knife into your boots. # TODO RMC14 , or attach it to the end of a rifle. + components: + - type: Clothing + slots: + - mask + - pocket + - suitstorage + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + - type: Tag + tags: + - Knife + - RMCAttachmentBarrel + - RMCM5Bayonet + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1 + damage: + types: + Slash: 25 + - type: DamageOtherOnHit + damage: + types: + Slash: 18 + - type: Item + size: Small + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + # - type: DisarmMalus + # malus: 0.225 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 10 + # - type: AttachableVisuals + # rsi: _RMC14/Objects/Weapons/Guns/Attachments/barrel.rsi + # prefix: bayonet + # - type: AttachableWeaponMeleeMods + # modifiers: + # - bonusDamage: + # types: + # Slash: 20 + # - type: AttachableWeaponRangedMods + # modifiers: + # - conditions: + # unwieldedOnly: true + # accuracyAddMult: -0.05 + # - type: AttachablePrying + +- type: entity + name: M11 throwing knife + parent: [ RMCBaseMeleeWeapon, BaseKnife] + id: CMM11Knife + description: A military knife designed to be thrown at the enemy. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/m11_knife.rsi + state: icon + - type: Clothing + slots: + - mask + - pocket + sprite: _RMC14/Objects/Weapons/Melee/m5_bayonet.rsi + - type: MeleeWeapon + damage: + types: + Slash: 5 + - type: LandAtCursor + - type: DamageOtherOnHit + damage: + types: + Slash: 50 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 3 + - type: Item + size: Small + sprite: _RMC14/Objects/Weapons/Melee/m11_knife.rsi + # - type: DisarmMalus + # malus: 0.225 + - type: Tag + tags: + - ThrowingKnife + +- type: entity + parent: [ RMCBaseMeleeWeapon, BaseKnife] + id: CMM2132Machete + name: M2132 machete + description: Latest issue of the Marine Machete. + components: + - type: Clothing + slots: + - belt + - suitstorage + - type: Tag + tags: + - Machete + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/machete.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 35 + - type: DamageOtherOnHit + damage: + types: + Slash: 4 + # - type: UsableWhileDevoured + # damage: + # types: + # Slash: 14 + - type: Item + size: Large + sprite: _RMC14/Objects/Weapons/Melee/machete.rsi + # - type: DisarmMalus + # malus: 0.225 + - type: Tool + qualities: + - Prying + - type: Prying + pryPowered: false + speedModifier: 0.8 + useSound: + path: /Audio/Items/crowbar.ogg + +- type: Tag + id: RMCM5Bayonet diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml new file mode 100644 index 00000000000..5c5a61c5fe4 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -0,0 +1,30 @@ +- type: entity + parent: [BaseItem, RMCBaseMeleeWeapon] + id: RMCPickaxe + name: pickaxe + description: It's a pickaxe. Notched to perfection, for jamming it into rocks. + suffix: RMC + components: + - type: Clothing + quickEquip: false + slots: + - Belt + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/pickaxe.rsi + state: icon + - type: Item + sprite: _RMC14/Objects/Weapons/Melee/pickaxe.rsi + size: Large + - type: Sharp + - type: MeleeWeapon + attackRate: 0.7 + wideAnimationRotation: -135 + damage: + types: + Slash: 15 + Blunt: 20 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Tag + tags: + - Pickaxe \ No newline at end of file diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml new file mode 100644 index 00000000000..2fa9c785741 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml @@ -0,0 +1,23 @@ +- type: entity + parent: Stunbaton + id: CMStunbaton + name: stun baton + description: A stun baton for incapacitating people with. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Melee/stun_baton.rsi + - type: Clothing + sprite: _RMC14/Objects/Weapons/Melee/stun_baton.rsi + slots: + - Belt + - Suitstorage + - type: StaminaDamageOnHit + damage: 100 + # - type: MeleeRequiresSkill + # skills: + # RMCSkillPolice: 1 + # - type: StunOnHit + # whitelist: + # components: + # - Marine + diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml new file mode 100644 index 00000000000..2cfc180d11d --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml @@ -0,0 +1,320 @@ +- type: entity + abstract: true + parent: GrenadeBase + id: CMGrenadeBase + name: grenade + description: Duck and cover. + components: + - type: Explosive + explosionType: Default + - type: ExplosionResistance + damageCoefficient: 0 + - type: OnUseTimerTrigger + delay: 4 + beepSound: + path: "/Audio/_RMC14/Explosion/armbomb.ogg" + params: + volume: -5 + initialBeepDelay: 0 + beepInterval: 10 + doPopup: false + - type: IgnorePredictionHide + - type: Clothing + slots: + - suitStorage + - type: Destructible + thresholds: [] + # - type: ChangeItemSizeOnTimerTrigger + # - type: CancelUseWithCloak + +- type: entity + abstract: true + id: RMCM40DPTags + components: + - type: Tag + tags: + - Grenade + - LauncherCompatibleGrenade + - RMCGrenadeM40 + +- type: entity + name: flashbang + description: Excellent for stopping groups of Rioters. Don't expect sunglasses to protect you... + parent: CMGrenadeBase + id: RMCGrenadeFlashBang + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/flashbang.rsi + # - type: RMCStunOnTrigger + # range: 7 + - type: FlashOnTrigger + range: 7 + - type: SoundOnTrigger + sound: + path: "/Audio/Effects/flash_bang.ogg" + - type: DeleteOnTrigger + - type: SpawnOnTrigger + proto: GrenadeFlashEffect + - type: Appearance + - type: TimerTriggerVisuals + primingSound: + path: /Audio/Effects/countdown.ogg + - type: Tag + tags: + - RMCGrenadeRiot + - Grenade + - RMCGrenadeFlashBang + +- type: entity + parent: + - CMGrenadeBase + - RMCM40DPTags + id: CMGrenadeHighExplosive + name: M40 HEDP grenade + description: High-Explosive Dual-Purpose. A small, but deceptively strong blast grenade that has been phasing out the M15 HE grenades alongside the M40 HEFA. Capable of being loaded in grenade launchers, or thrown by hand. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40hedp.rsi + - type: ExplodeOnTrigger + - type: Explosive + maxIntensity: 20 # max 100 brute, 100 burn + intensitySlope: 6 + totalIntensity: 200 + canCreateVacuum: false + - type: Ammo + # - type: CMExplosionEffect + # - type: CMVocalizeTrigger + # - type: RMCScorchEffect + +- type: entity + parent: NFPelletClusterLethal + id: CMProjectileShrapnel + categories: + - HideSpawnMenu + +- type: entity + parent: + - CMGrenadeBase + - RMCM40DPTags + id: CMGrenadeSmoke + name: M40 HSDP smoke grenade + description: The M40 HSDP is a small, but powerful smoke grenade. Based off the same platform as the M40 HEDP. It is set to detonate in 2 seconds. + components: + - type: OnUseTimerTrigger + delay: 2 + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40smoke.rsi + - type: SmokeOnTrigger + duration: 30 + spreadAmount: 50 + - type: SoundOnTrigger + sound: /Audio/Effects/smoke.ogg + - type: DeleteOnTrigger + - type: TimerTriggerVisuals + primingSound: + path: /Audio/Effects/Smoke-grenade.ogg + - type: Tag + tags: + - Grenade + - LauncherCompatibleGrenade + - RMCGrenadeM40 + - type: Ammo + +- type: entity + parent: Smoke + id: RMCSmoke + components: + - type: Transform + anchored: true + - type: Occluder + - type: Sprite + sprite: _RMC14/Effects/smoke.rsi + state: smoke2 + - type: TimedDespawn + lifetime: 10 + - type: Tag + tags: + - HideContextMenu + - type: Appearance + - type: ActiveEdgeSpreader + # - type: DeleteOnExplosion + +- type: entity + parent: CMGrenadeHighExplosive + id: CMGrenadeFrag + name: M40 HEFA grenade + description: High-Explosive Fragmenting-Antipersonnel. A small, but deceptively strong fragmentation grenade that has been phasing out the M15 fragmentation grenades alongside the M40 HEDP. Capable of being loaded in grenade launchers, or thrown by hand. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40hefa.rsi + - type: Explosive + maxIntensity: 8 # max 40 brute 40 burn + intensitySlope: 4 + totalIntensity: 110 + deleteAfterExplosion: false + - type: ProjectileGrenade + fillPrototype: CMProjectileShrapnel + capacity: 48 + - type: DeleteOnTrigger + - type: ContainerContainer + containers: + cluster-payload: !type:Container + - type: Ammo + # - type: ClusterLimitHits + # - type: CMExplosionEffect + # maxShrapnel: 0 + # - type: CMVocalizeTrigger + # - type: RMCScorchEffect + +- type: entity + parent: CMGrenadeHighExplosive + id: CMGrenadeFragOld + name: M15 fragmentation grenade + description: An outdated UNMC Fragmentation Grenade. With decades of service in the UNMC, the old M15 Fragmentation Grenade is slowly being replaced by the slightly safer M40-series grenades. It is set to detonate in 4 seconds. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m15frag.rsi + - type: Explosive + maxIntensity: 20 + intensitySlope: 6 + totalIntensity: 240 + deleteAfterExplosion: false + - type: ProjectileGrenade + fillPrototype: CMProjectileShrapnel + capacity: 48 #same as HEFA + - type: DeleteOnTrigger + - type: ContainerContainer + containers: + cluster-payload: !type:Container + - type: Tag + tags: + - Grenade + - type: Ammo + # - type: ClusterLimitHits + # - type: CMExplosionEffect + # maxShrapnel: 0 + # - type: CMVocalizeTrigger + # - type: RMCScorchEffect + +- type: entity + parent: CMGrenadeBase + id: RMCGrenadeTraining + name: M07 Training Grenade + description: A harmless reusable version of the M40 HEDP, used for training. Capable of being loaded into a grenade launcher, or thrown by hand. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m07training.rsi + - type: SoundOnTrigger + sound: /Audio/Effects/snap.ogg + - type: Tag + tags: + - Grenade + - LauncherCompatibleGrenade + - RMCGrenadeTraining + - RMCGrenadeM40 + - type: Ammo + +- type: entity + parent: + - CMGrenadeBase + - RMCM40DPTags + id: RMCGrenadeIncendiary + name: M40 HIDP incendiary grenade + description: The M40 HIDP is a small, but deceptively strong incendiary grenade designed to disrupt enemy mobility with long-lasting Type B napalm. It is set to detonate in 4 seconds. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/m40hidp.rsi + - type: OnUseTimerTrigger + beepSound: null + # - type: CMVocalizeTrigger + # - type: TileFireOnTrigger + # spawn: RMCTileFireGreen + +- type: entity + parent: RMCGrenadeIncendiary + id: RMCGrenadeMolotov + name: improvised firebomb + description: A potent, improvised firebomb, coupled with a pinch of gunpowder. Cheap, very effective, and deadly in confined spaces. Commonly found in the hands of rebels and terrorists. It can be difficult to predict how many seconds you have before it goes off, so be careful. Chances are, it might explode in your face. + components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Grenades/molotov.rsi + - type: OnUseTimerTrigger + examinable: false + - type: RandomTimerTrigger + min: 1 + max: 4 + # - type: TileFireOnTrigger + # spawn: RMCTileFire + - type: Tag + tags: + - Grenade + +- type: entity + id: CMExplosionEffectGrenade + categories: + - HideSpawnMenu + components: + - type: Sprite + sprite: _RMC14/Effects/grenade_explosion.rsi + state: grenade + - type: TimedDespawn + lifetime: 0.6 + +- type: entity + id: RMCExplosionEffectGrenadeShockWave + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.5 + # - type: RMCExplosionShockWave + +- type: entity + id: CMExplosionEffectShrapnel1 + categories: + - HideSpawnMenu + components: + - type: CollisionWake + - type: Physics + bodyType: Dynamic + fixedRotation: true + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0 + - type: Sprite + sprite: _RMC14/Objects/Weapons/shrapnel.rsi + state: shrapnel_bright1 + - type: TimedDespawn + lifetime: 0.5 + - type: TriggerOnCollide + fixtureID: fix1 + - type: DeleteOnTrigger + + +- type: entity + parent: CMExplosionEffectShrapnel1 + id: CMExplosionEffectShrapnel2 + categories: + - HideSpawnMenu + components: + - type: Sprite + state: shrapnel_bright2 + +- type: Tag + id: RMCGrenadeM40 + +- type: Tag + id: RMCGrenadeTraining + +- type: Tag + id: RMCGrenadeRiot + +- type: Tag + id: RMCGrenadeFlashBang diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml new file mode 100644 index 00000000000..86c769824e7 --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/packets.yml @@ -0,0 +1,184 @@ +- type: entity + abstract: true + parent: BaseStorageItem + id: CMPacketBase + name: packet + components: + - type: Sprite + sprite: _RMC14/Objects/Storage/packets.rsi + state: general_packet + - type: Item + size: Normal + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,1 # 3 slots + whitelist: + tags: + - Grenade + - type: UseDelay + delay: 0.5 + # - type: FixedItemSizeStorage + # - type: InteractedBlacklist + # blacklist: + # components: + # - Xeno + - type: Appearance + # - type: CMStorageVisualizer + # storageClosed: closedLayer + # storageOpen: openLayer + # storageEmpty: emptyLayer + +- type: entity + parent: CMPacketBase + id: CMPacketGrenadeHighExplosive + name: HEDP grenade packet + description: It contains three HEDP high explosive grenades. + components: + - type: Sprite + layers: + - state: hedp_packet + map: [ "closedLayer" ] + - state: hedp_packet_e + map: [ "openLayer", "emptyLayer" ] + +- type: entity + parent: CMPacketGrenadeHighExplosive + id: CMPacketGrenadeHighExplosiveFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeHighExplosive + amount: 3 + +- type: entity + parent: CMPacketBase + id: CMPacketGrenadeFrag + name: HEFA grenade packet + description: It contains three HEFA grenades. Don't tell the HEFA order. + components: + - type: Sprite + layers: + - state: hefa_packet + map: [ "closedLayer" ] + - state: hefa_packet_e + map: [ "openLayer", "emptyLayer" ] + +- type: entity + parent: CMPacketGrenadeFrag + id: CMPacketGrenadeFragFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeFrag + amount: 3 + +- type: entity + parent: BaseStorageItem + id: RMCPacketGrenadeFlashBang + name: flash-bang box + suffix: Filled + components: + - type: Sprite + sprite: _RMC14/Objects/Storage/flashbangs.rsi + layers: + - state: flashbang + map: [ "closedLayer" ] + - state: flashbang_e + map: [ "openLayer", "emptyLayer" ] + - type: Item + size: Normal + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,1 # 3 slots + whitelist: + tags: + - RMCGrenadeFlashBang + - type: UseDelay + delay: 0.5 + # - type: FixedItemSizeStorage + # - type: InteractedBlacklist + # blacklist: + # components: + # - Xeno + - type: Appearance + # - type: CMStorageVisualizer + # storageClosed: closedLayer + # storageOpen: openLayer + # storageEmpty: emptyLayer + - type: StorageFill + contents: + - id: RMCGrenadeFlashBang + amount: 8 + +- type: entity + parent: CMPacketBase + id: RMCPacketGrenadeSmoke + name: HSDP grenade packet + description: It contains three HSDP smoke grenades. + components: + - type: Sprite + layers: + - state: hsdp_packet + map: [ "closedLayer" ] + - state: hsdp_packet_e + map: [ "openLayer", "emptyLayer"] + +- type: entity + parent: RMCPacketGrenadeSmoke + id: RMCPacketGrenadeSmokeFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeSmoke + amount: 3 + +- type: entity + parent: CMPacketBase + id: RMCPacketGrenadeIncendiary + name: HIDP grenade packet + description: It contains three HIDP incendiary grenades. + components: + - type: Sprite + layers: + - state: hidp_packet + map: [ "closedLayer" ] + - state: hidp_packet_e + map: [ "openLayer", "emptyLayer"] + +- type: entity + parent: RMCPacketGrenadeIncendiary + id: RMCPacketGrenadeIncendiaryFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: RMCGrenadeIncendiary + amount: 3 + +- type: entity + parent: CMPacketBase + id: CMPacketGrenadeFragOld + name: M15 frag grenade packet + description: It contains three M15 fragmentation grenades. Handle with care. + components: + - type: Sprite + layers: + - state: m15_packet + map: [ "closedLayer" ] + - state: m15_packet_e + map: [ "openLayer", "emptyLayer" ] + +- type: entity + parent: CMPacketGrenadeFragOld + id: CMPacketGrenadeFragOldFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: CMGrenadeFragOld + amount: 3 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml new file mode 100644 index 00000000000..7aeb6c850ed --- /dev/null +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/attachable_compat.yml @@ -0,0 +1,7 @@ +- type: entity + abstract: true + id: RMCBaseAttachableHolder + +- type: entity + abstract: true + id: RMCAttachableBase \ No newline at end of file From 6ba0bd2fa0a4bf679ec3b833e0c537365a602f33 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 03:29:20 -0600 Subject: [PATCH 08/21] bezoar --- .../Entities/Catalog/Fills/Xeno/Bezoar.yml | 129 ++++++++++++++++++ .../_HL/Entities/Mobs/NPC/Xenos.yml | 40 +++++- .../Weapons/Guns/Pistols/base_pistol.yml | 1 + .../Weapons/Guns/Shotguns/base_shotgun.yml | 3 +- .../_HL/Objects/Storage/Bezoar.rsi/bezoar.png | Bin 0 -> 5624 bytes .../_HL/Objects/Storage/Bezoar.rsi/meta.json | 14 ++ 6 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml create mode 100644 Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/bezoar.png create mode 100644 Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/meta.json diff --git a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml new file mode 100644 index 00000000000..ed74897a7d8 --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml @@ -0,0 +1,129 @@ +- type: entity + parent: BaseItem + id: Bezoar + name: Xeno Bezoar + description: oh god- I think it ate someone. + # abstract: true + # categories: [ HideSpawnMenu ] + suffix: NPC Loot + components: + - type: Sprite + sprite: _HL/Objects/Storage/bezoar.rsi + scale: 0.3, 0.3 + state: bezoar + - type: Item + size: Normal + - type: SpawnItemsOnUse + items: + - id: SpaceCash10 + - id: SpawnDungeonLootSeed + - id: SpawnDungeonLootMaterialsBasicFull + prob: 0.7 + - id: SpawnDungeonLootMaterialsValuableFull + prob: 0.7 + - id: RMCLoot + - id: RMCLoot + - id: RMCLoot + sound: + path: /Audio/Effects/desecration-01.ogg + +- type: entity + parent: BaseItem + id: RMCLoot + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: Objects/Weapons/Melee/shiv.rsi + state: icon + - sprite: Effects/crayondecals.rsi + state: 1 + color: red + - type: RandomSpawner + prototypes: + - WeaponShotgunM42A2 + - WeaponShotgunM890 + - RMCWeaponShotgunM890Riot + - WeaponShotgunM357 + - WeaponShotgunM357Sawn + - WeaponShotgunCustomBuilt + - RMCWeaponShotgunXM51 + - RMCGrenadeFlashBang + - CMGrenadeHighExplosive + - CMGrenadeSmoke + - CMGrenadeFrag + - CMM96SSniperRifle + - CMMagazineSniperM96S + - CMMagazineSniperM96SIncendiary + - CMMagazineSniperM96SFlak + - CMMagazineSniperM96SAntiMateriel + - RMCExplosiveBreachingCharge + - CMStunbaton + - RMCFireAxe + - CMFlash + - RMCM5Bayonet + - CMM11Knife + - CMM2132Machete + - RMCPickaxe + - RMCWeaponLauncherM81 + - RMCWeaponLauncherM5ATL + - CMWeaponLauncherM79 + - WeaponLauncherM83 + - RMCWeaponLMGM60 + - RMCMagazineLMGM60 + - RMCWeaponPistolSU6 + - RMCWeaponPistolB92FS + - RMCWeaponPistolHoldout + - RMCWeaponPistolD18 + - CMWeaponPistolM77 + - CMWeaponPistolM1984 + - RMCWeaponPistolMK45 + - CMWeaponPistolMK80 + - RMCWeaponRevolverRSh9 + - RMCWeaponRevolverM44 + - RMCWeaponRevolverMateba + - WeaponRifleXM88 + - WeaponRifleM59A + - WeaponRifleM54C + - WeaponRifleM54CE2 + - WeaponRifleM16 + - WeaponRifleM4SPRCustom + - WeaponRifleM4SPR + - WeaponRifleAR10 + - RMCSmartGun + - WeaponSMGMP5 + - WeaponSMGM63 + - WeaponNailgun + - CMBeltKnifeFilled + - ArmorHelmetM10 + - CMArmorHelmetM10MP + - CMArmorHelmetM10ChiefMP + - RMCArmorHelmetM10SO + - CMArmorHelmetM10Medic + - RMCArmorHelmetM10Welding + - CMArmorHelmetM11 + - CMArmorHelmetM11CCO + - CMArmorHelmetM11CGeneral + - CMArmorHelmetM12 + - CMArmorHelmetM30 + - CMArmorHelmetPress + - RMCArmorHelmetM3Scout + - RMCArmorHelmetM3G4 + - CMArmorHelmetM35 + - CMArmorHelmetM45 + - RMCArmorHelmetM3TDemo + - RMCArmorHelmetM12Intel + - CMArmorM3Medium + - CMArmorM3Heavy + - RMCArmorM3G4 + - CMArmorM3Light + - RMCArmorM3Scout + - CMArmorM3VLSynth + - CMArmorM2MP + - RMCArmorProvostAgent + - RMCCoatPilot + - RMCArmorVest + - RMCArmorVestFlak + chance: 1.0 + offset: 0.0 \ No newline at end of file diff --git a/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml b/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml index 656a42f7824..d175cfd3e8d 100644 --- a/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml +++ b/Resources/Prototypes/_HL/Entities/Mobs/NPC/Xenos.yml @@ -161,7 +161,6 @@ - type: Puller needsHands: false - type: Butcherable - butcheringType: Spike spawned: - id: FoodMeatXeno amount: 5 @@ -367,6 +366,12 @@ - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 2 - type: MeleeWeapon damage: groups: @@ -523,10 +528,11 @@ baseWalkSpeed : 5 baseSprintSpeed : 6 - type: Butcherable - butcheringType: Spike spawned: - id: FoodMeatRouny amount: 3 + - id: Bezoar + amount: 1 - type: Stealth enabledOnDeath: false maxVisibility: 1.2 @@ -861,6 +867,12 @@ - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Gun fireRate: 0.5 useKey: false @@ -909,6 +921,12 @@ types: Blunt: 20 Piercing: 6 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Xeno actionIds: - ActionXenoRest @@ -953,6 +971,12 @@ types: Blunt: 12 Piercing: 8 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Xeno actionIds: - ActionXenoRest @@ -1147,6 +1171,12 @@ productionLength: 2 entityProduced: MaterialRoyalResin1 hungerCost: 0.1 + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 2 - type: Xeno actionIds: - ActionXenoRest @@ -1349,6 +1379,12 @@ 0: Alive 700: Critical 800: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 + - id: Bezoar + amount: 1 - type: Xeno actionIds: - ActionXenoRest diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml index 257b335c682..18c0c8a13c8 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml @@ -5,6 +5,7 @@ components: - type: AmmoCounter - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi layers: - state: base map: [ "enum.GunVisualLayers.Base" ] diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml index f02cb6d9230..390693d27cd 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/base_shotgun.yml @@ -47,7 +47,7 @@ tags: - RMCShellShotgun capacity: 9 - proto: null + proto: CMPelletShotgunBuckshot soundInsert: collection: CMShotgunLoad - type: ContainerContainer @@ -91,6 +91,7 @@ - type: BallisticAmmoProvider cycleable: true capacity: 2 + proto: CMPelletShotgunBuckshot soundInsert: path: /Audio/_RMC14/Weapons/Guns/Reload/grenade_insert.ogg params: diff --git a/Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/bezoar.png b/Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/bezoar.png new file mode 100644 index 0000000000000000000000000000000000000000..bd055e1cb98d9bbd3049bc8b1a3df384d2056caf GIT binary patch literal 5624 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 Date: Thu, 21 May 2026 03:38:51 -0600 Subject: [PATCH 09/21] fix --- .../Objects/Weapons/Guns/cm_base_gun.yml | 2 +- .../equipped-INNERCLOTHING.png | Bin 1196 -> 0 bytes .../junglefatigues.rsi/icon.png | Bin 437 -> 0 bytes .../jacket-equipped-INNERCLOTHING.png | Bin 732 -> 0 bytes .../junglefatigues.rsi/meta.json | 30 ------------------ .../sleeveless-equipped-INNERCLOTHING.png | Bin 1085 -> 0 bytes .../sleeves-equipped-INNERCLOTHING.png | Bin 1155 -> 0 bytes 7 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/icon.png delete mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/jacket-equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/meta.json delete mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeveless-equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml index a803e7b0b0d..c02f748bf5b 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/cm_base_gun.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: NFBaseItemWeaponGun + parent: [ NFBaseItemWeaponGun, BaseC3ExpeditionContraband ] id: CMBaseWeaponGun components: - type: Clothing diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 4f878fa3f8738c86369eaa251bd3aeef024297c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1196 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 Dg>Udr diff --git a/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png b/Resources/Textures/_AU14/Clothing/desertfatigues.rsi/junglefatigues.rsi/sleeves-equipped-INNERCLOTHING.png deleted file mode 100644 index 0a313555ee7cb5a688069e682cb5b15c2b325bf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1155 zcmV-}1bq96P)Cf2&NFL6cU4wLi`1S z7XBCue}k2c1`Ep+2?Rq3DMV5vxk$i6gX9OS_wC-dI~gyzeX}zgVdrc1W_EACH{ZNB z^LA#gNW&2YkcJ})APq+pKpKuHfHWLY0L{ZI%L_^W$BDFOrsTuN_12_%-!OS*+nv1r zsDB`?{G|l|IZ3>S>MagxtJw zEwS&R;Q)K!pnu#tFx=Az$p7Hpd~(rqL;GZN>sxDctNgoF(;#~QApjipCI2nbF?t{z zAaucbw%!FQ0iZBIw>LuoaftiAdp|VPnV{VR9F1Ljzy%Q77t|q;AscDeHumy+9Hc_x zqW8PvRm6(;ZPzeB+XO9DzpD{PHd|syJ z3wS?5jeMB%3;vE1zd8iWEDY{Ow?sV*2^|8y`Qw6!=3%%PM*QN#L(Y64)e!;=L7U(H zT^8y*fL~>tbIshKjy!;k|Ce9F=Ki^JP4Z0QlkS2!}6Nc0iH%NML%!Ld=k_GynXjRcds|EUnC3#7!-PA1ONv&WFZ8W z$zjtl^wPRXTj(|_O@myIuN#beo(!piN&*z|mc?KlJ3|0Gz+N48g?eM8j>XR^(Aucp z7ch}cH@cYf0kik*DKF?OFmBzQbs*mF|B}$anS{AfBQLV2EY#-%o-IF4I1?Z#!4>l` z2cyAYAR#f=zMk&~f^(P(=gAjlCG8mnl>j4mOPGxT7>O|zu5Y;I;#x55GX5+h9sW)* z0Hg6iQ(+p=o>@rD!%;Z9TSwzf8-|yJ=Mn%2P|L>fk0vS49va!pw!ASsfuC3#IU`QLB1gP^&KxiA{qNp?+e*v%S VAn0PFX&(Rp002ovPDHLkV1koC1Azbl From 7ec1143100abec671a19c2d9e10fbf3f3612b5b7 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 03:51:12 -0600 Subject: [PATCH 10/21] Update Bezoar.yml --- Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml index ed74897a7d8..ea50ad33508 100644 --- a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml +++ b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml @@ -8,7 +8,7 @@ suffix: NPC Loot components: - type: Sprite - sprite: _HL/Objects/Storage/bezoar.rsi + sprite: _HL/Objects/Storage/Bezoar.rsi scale: 0.3, 0.3 state: bezoar - type: Item From 1df419dacd13654a65003967c76b935102d45d19 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 04:04:16 -0600 Subject: [PATCH 11/21] Update Bezoar.yml --- Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml index ea50ad33508..6746693b852 100644 --- a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml +++ b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml @@ -33,8 +33,6 @@ components: - type: Sprite layers: - - state: green - scale: 0.7, 0.7 - sprite: Objects/Weapons/Melee/shiv.rsi state: icon - sprite: Effects/crayondecals.rsi From 018b5608c7b5515b401c5432b8451d5869a2c42c Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 04:15:12 -0600 Subject: [PATCH 12/21] Update base_pistol.yml --- .../Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml index 18c0c8a13c8..dd8721e048a 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml @@ -7,9 +7,11 @@ - type: Sprite sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi layers: - - state: base + - sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + state: base map: [ "enum.GunVisualLayers.Base" ] - - state: mag-0 + - sprite: _RMC14/Objects/Weapons/Guns/Pistols/mk80.rsi + state: mag-0 map: [ "enum.GunVisualLayers.Mag" ] - type: Item size: Normal From 81d997d441773a44a11f9522e0f7498b14bfc055 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 04:27:05 -0600 Subject: [PATCH 13/21] Update base_sniper.yml --- .../Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml index 4384ae7dcaf..9114d4826d8 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Snipers/base_sniper.yml @@ -3,6 +3,8 @@ parent: [ NFBaseWeaponEncumbranceRifleAssault, NFBaseItemWeaponGunMagazineFed ] id: RMCBaseWeaponSniperRifle components: + - type: Sprite + sprite: _RMC14/Objects/Weapons/Guns/Snipers/m96s.rsi - type: Gun selectedMode: SemiAuto availableModes: From f7dcd8278f98c88c86cd7baa2d8591471bad1854 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 04:33:57 -0600 Subject: [PATCH 14/21] Update base_gun.yml --- .../Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml index fa186061931..9dd10dc8c6b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/base_gun.yml @@ -6,6 +6,7 @@ abstract: true components: - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] From 213fe484f9913bb0426b75374052ed49e2bc70b2 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 04:39:23 -0600 Subject: [PATCH 15/21] Update Bezoar.yml --- Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml index 6746693b852..5189adfafa3 100644 --- a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml +++ b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml @@ -8,7 +8,7 @@ suffix: NPC Loot components: - type: Sprite - sprite: _HL/Objects/Storage/Bezoar.rsi + sprite: _HL/Objects/Storage/bezoar.rsi scale: 0.3, 0.3 state: bezoar - type: Item From 02ed6db3afb106dc1170f63a752acd123dfe7d5a Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 04:46:55 -0600 Subject: [PATCH 16/21] fix --- .../_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml | 2 +- .../Storage/{Bezoar.rsi => bezoar1.rsi}/bezoar.png | Bin .../Storage/{Bezoar.rsi => bezoar1.rsi}/meta.json | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/_HL/Objects/Storage/{Bezoar.rsi => bezoar1.rsi}/bezoar.png (100%) rename Resources/Textures/_HL/Objects/Storage/{Bezoar.rsi => bezoar1.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml index 5189adfafa3..14b63c7e483 100644 --- a/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml +++ b/Resources/Prototypes/_HL/Entities/Catalog/Fills/Xeno/Bezoar.yml @@ -8,7 +8,7 @@ suffix: NPC Loot components: - type: Sprite - sprite: _HL/Objects/Storage/bezoar.rsi + sprite: _HL/Objects/Storage/bezoar1.rsi scale: 0.3, 0.3 state: bezoar - type: Item diff --git a/Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/bezoar.png b/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/bezoar.png similarity index 100% rename from Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/bezoar.png rename to Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/bezoar.png diff --git a/Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/meta.json b/Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/meta.json similarity index 100% rename from Resources/Textures/_HL/Objects/Storage/Bezoar.rsi/meta.json rename to Resources/Textures/_HL/Objects/Storage/bezoar1.rsi/meta.json From 348f16450441eaa2a59ab5c0e09f8f7a800db335 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 12:24:48 -0600 Subject: [PATCH 17/21] fixes --- .../Locale/en-US/_RMC14/ammo_handfuls.ftl | 8 +++ .../Guns/Launchers/m5_atl_rocket_launcher.yml | 9 ++-- .../Weapons/Guns/Pistols/holdout_pistol.yml | 12 ++--- .../Objects/Weapons/Guns/Rifles/m16_rifle.yml | 4 +- .../Weapons/Guns/Rifles/rifle_handfuls.yml | 2 +- .../Guns/Shotguns/shotgun_handfuls.yml | 14 +++--- .../Weapons/Guns/SmartGuns/smart_gun.yml | 11 +++- .../Entities/Objects/Weapons/Melee/flash.yml | 1 - Resources/Prototypes/_RMC14/tags.yml | 50 +++++++++++++++++++ 9 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl create mode 100644 Resources/Prototypes/_RMC14/tags.yml diff --git a/Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl b/Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl new file mode 100644 index 00000000000..a16c69d13a9 --- /dev/null +++ b/Resources/Locale/en-US/_RMC14/ammo_handfuls.ftl @@ -0,0 +1,8 @@ +rmc-handful-458-socom-name = handful of .458 SOCOM bullets +rmc-handful-buckshot-shells-name = handful of buckshot shells +rmc-handful-breaching-shells-name = handful of breaching shells +rmc-handful-shotgun-slugs-name = handful of shotgun slugs +rmc-handful-incendiary-slugs-name = handful of incendiary slugs +rmc-handful-beanbag-slugs-name = handful of beanbag slugs +rmc-handful-flechette-shells-name = handful of flechette shells +rmc-handful-incendiary-buckshot-shells-name = handful of incendiary buckshot shells \ No newline at end of file diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml index 5d3ccdfc4c6..83f1e4af1f1 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Launchers/m5_atl_rocket_launcher.yml @@ -26,8 +26,7 @@ capacity: 1 cycleable: true mayTransfer: false - insertDelay: 6.0 - cycleDelay: 6.0 + fillDelay: 6.0 proto: RMCRocket84mm soundInsert: path: /Audio/_RMC14/Weapons/Guns/Cock/m5_ammo.ogg @@ -127,7 +126,8 @@ damage: types: Blunt: 15 - maxFixedRange: 6 # 7 tiles + - type: TimedDespawn + lifetime: 0.2 - type: Sprite sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/m5spec_projectiles.rsi layers: @@ -187,8 +187,9 @@ Heat: 150 # 10 brute damage + 150 brute and 150 burn to simulate direct explosive damage. # Temporary mechanic to make it consistent with intended main target damage. - maxFixedRange: 5 # 6 tiles armorPenetration: 100 # Ignores all armor. + - type: TimedDespawn + lifetime: 0.2 - type: Sprite sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Projectiles/m5spec_projectiles.rsi layers: diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml index ba1e3653287..1500ff6d3ae 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/holdout_pistol.yml @@ -71,8 +71,8 @@ mayTransfer: True whitelist: tags: - - CMCartridgePistol.22mm - proto: CMCartridgePistol.22mm + - CMCartridgePistol22mm + proto: CMCartridgePistol22mm capacity: 5 - type: Sprite sprite: _RMC14/Objects/Weapons/Guns/Ammunition/Magazines/holdout.rsi @@ -84,7 +84,7 @@ - type: entity parent: CMBulletBase - id: CMBulletPistol.22mm + id: CMBulletPistol22mm name: bullet (.22) components: - type: Projectile @@ -95,16 +95,16 @@ # amount: 10 - type: entity - id: CMCartridgePistol.22mm + id: CMCartridgePistol22mm name: cartridge (.22) parent: CMCartridgePistolBase components: - type: Tag tags: - Cartridge - - CMCartridgePistol.22mm + - CMCartridgePistol22mm - type: CartridgeAmmo - proto: CMBulletPistol.22mm + proto: CMBulletPistol22mm - type: Tag diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml index e0eb49dbcbc..357bebd3a6e 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m16_rifle.yml @@ -112,11 +112,11 @@ - Cartridge - RMCCartridgeRifleM16 - type: CartridgeAmmo - proto: BulletRifle5.56x45mm + proto: BulletRifle556x45mm - type: entity parent: BulletRifle10x24mm - id: BulletRifle5.56x45mm + id: BulletRifle556x45mm components: - type: Projectile damage: diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml index 14f2d871af6..086b8228ef5 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/rifle_handfuls.yml @@ -33,7 +33,7 @@ - type: stack id: RMCCartridge458SOCOM - name: handful of .458 SOCOM bullets + name: rmc-handful-458-socom-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Magazines/xm88.rsi, state: SOCOM1 } spawn: RMCCartridge458SOCOM maxCount: 9 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml index 20409eca04b..598e66d52dd 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_handfuls.yml @@ -30,7 +30,7 @@ - type: stack id: RMCShellShotgunBuckshot - name: handful of buckshot shells + name: rmc-handful-buckshot-shells-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: buckshot_shell_1 } spawn: CMShellShotgunBuckshot maxCount: 5 @@ -68,7 +68,7 @@ - type: stack id: RMCShellShotgunBreaching - name: handful of breaching shells + name: rmc-handful-breaching-shells-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: breaching_shell_1 } spawn: RMCShellShotgunBreaching maxCount: 6 @@ -105,7 +105,7 @@ - type: stack id: RMCShellShotgunSlug - name: handful of shotgun slugs + name: rmc-handful-shotgun-slugs-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: slug_shell_1 } spawn: CMShellShotgunSlugs maxCount: 5 @@ -142,7 +142,7 @@ - type: stack id: RMCShellShotgunIncendiary - name: handful of incendiary slugs + name: rmc-handful-incendiary-slugs-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: incendiary_slug_1 } spawn: CMShellShotgunIncendiary maxCount: 5 @@ -179,7 +179,7 @@ - type: stack id: RMCShellShotgunBeanbag - name: handful of beanbag slugs + name: rmc-handful-beanbag-slugs-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: beanbag_slug_1 } spawn: CMShellShotgunBeanbag maxCount: 5 @@ -216,7 +216,7 @@ - type: stack id: RMCShellShotgunFlechette - name: handful of flechette shells + name: rmc-handful-flechette-shells-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: flechette_shell_1 } spawn: CMShellShotgunFlechette maxCount: 5 @@ -253,7 +253,7 @@ - type: stack id: RMCShellShotgunIncendiaryBuckshot - name: handful of incendiary buckshot shells + name: rmc-handful-incendiary-buckshot-shells-name icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Ammunition/Handfuls/shotgun_handfuls.rsi, state: incen_buckshot_1 } spawn: CMShellShotgunIncendiaryBuckshot maxCount: 5 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml index 7d4f38ebf8b..16449be8f9b 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/SmartGuns/smart_gun.yml @@ -93,7 +93,7 @@ name: power-cell-slot-component-slot-name-default startingItem: RMCPowerCellSmartgun whitelist: - components: + tags: - SmartGunBattery - type: GunDamageModifier multiplier: 1 @@ -234,6 +234,15 @@ # - range: 5 # falloff: 10 +- type: entity + parent: PowerCellHigh + id: RMCPowerCellSmartgun + name: smartgun power cell + components: + - type: Tag + tags: + - SmartGunBattery + - type: Tag id: RMCMagazineSmartGun diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml index d3c074176c6..6f6d0c81cf8 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml @@ -11,7 +11,6 @@ sprite: _RMC14/Objects/Weapons/Melee/flash.rsi - type: LimitedCharges maxCharges: 5 - charges: 5 - type: AutoRecharge rechargeDuration: 30 - type: UseDelay diff --git a/Resources/Prototypes/_RMC14/tags.yml b/Resources/Prototypes/_RMC14/tags.yml new file mode 100644 index 00000000000..7d5eb2c7b75 --- /dev/null +++ b/Resources/Prototypes/_RMC14/tags.yml @@ -0,0 +1,50 @@ +- type: Tag + id: CMCartridge10x20mm + +- type: Tag + id: CMCartridgePistol22mm + +- type: Tag + id: CMCartridgePistol9mm + +- type: Tag + id: CMCartridgePistol9mmAP + +- type: Tag + id: LauncherCompatibleGrenade + +- type: Tag + id: RMCAttachmentBarrel + +- type: Tag + id: RMCCartridge7x45mm + +- type: Tag + id: RMCCartridgePistol45ACP + +- type: Tag + id: RMCCartridgeRevolver44 + +- type: Tag + id: RMCGunBipodFullAuto + +- type: Tag + id: RMCMagazinePistolM1984Rubber + +- type: Tag + id: RMCMagazinePistolM77Rubber + +- type: Tag + id: RMCMK80 + +- type: Tag + id: RMCRocketAmmo84mm + +- type: Tag + id: RMCSmartPistol + +- type: Tag + id: SmartGunBattery + +- type: Tag + id: ThrowingKnife \ No newline at end of file From 1962962afadaf1b958197c7dd4d1c553e96b9737 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 12:33:26 -0600 Subject: [PATCH 18/21] Update tags.yml --- Resources/Prototypes/_RMC14/tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_RMC14/tags.yml b/Resources/Prototypes/_RMC14/tags.yml index 7d5eb2c7b75..835aaf4cbcb 100644 --- a/Resources/Prototypes/_RMC14/tags.yml +++ b/Resources/Prototypes/_RMC14/tags.yml @@ -34,6 +34,9 @@ - type: Tag id: RMCMagazinePistolM77Rubber +- type: Tag + id: RMCMagazineSMGM63Rubber + - type: Tag id: RMCMK80 From 0deea5795c6deec837ef2f4a43874b0de211ecfc Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 12:39:56 -0600 Subject: [PATCH 19/21] tweak --- .../_RMC14/Entities/Objects/Weapons/Melee/flash.yml | 6 +++--- .../_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml index 6f6d0c81cf8..72b6eab1909 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/flash.yml @@ -2,7 +2,7 @@ parent: Flash id: CMFlash name: flash - description: Used for blinding and being an asshole. Recharges one flash every 30 seconds. You must wait 1 second between uses for the capacitor to recharge. + description: Used for blinding and being an asshole. Recharges one flash every 120 seconds. You must wait 1 second between uses for the capacitor to recharge. components: - type: Sprite sprite: _RMC14/Objects/Weapons/Melee/flash.rsi @@ -12,9 +12,9 @@ - type: LimitedCharges maxCharges: 5 - type: AutoRecharge - rechargeDuration: 30 + rechargeDuration: 120 - type: UseDelay - delay: 0.5 + delay: 1 - type: Appearance - type: GenericVisualizer visuals: diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml index 2fa9c785741..f9768479952 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Melee/stun_baton.yml @@ -12,7 +12,7 @@ - Belt - Suitstorage - type: StaminaDamageOnHit - damage: 100 + damage: 50 # - type: MeleeRequiresSkill # skills: # RMCSkillPolice: 1 From e9a12991386d3e0d0d907d233f24f86dddf5dff3 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 13:18:58 -0600 Subject: [PATCH 20/21] damage rebalance --- .../_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml | 2 +- .../Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml | 2 +- .../Objects/Weapons/Guns/Revolvers/m44_revolver.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Revolvers/mateba.yml | 2 +- .../Entities/Objects/Weapons/Guns/Revolvers/rs9.yml | 2 +- .../Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml | 6 +++--- .../Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml | 2 +- .../Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml index 31b975bfcec..c9447600880 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/LMGs/m60_lmg.yml @@ -142,7 +142,7 @@ - type: Projectile damage: types: - Piercing: 45 + Piercing: 28 # - type: RMCProjectileDamageFalloff # thresholds: # - range: 22 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml index dd8721e048a..1a133f7beec 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Pistols/base_pistol.yml @@ -131,7 +131,7 @@ - type: Projectile damage: types: - Piercing: 40 + Piercing: 35 # - type: CMArmorPiercing # amount: 10 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml index 9296f36ea1f..8ff70026f7f 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/m44_revolver.yml @@ -158,7 +158,7 @@ - type: Projectile damage: types: - Piercing: 72 + Piercing: 50 # - type: CMArmorPiercing # amount: 5 # - type: RMCProjectileAccuracy @@ -172,7 +172,7 @@ - type: Projectile damage: types: - Piercing: 55 + Piercing: 40 # - type: RMCProjectileDamageFalloff # thresholds: # - range: 22 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml index 28431a13a94..4b94d948b90 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/mateba.yml @@ -124,7 +124,7 @@ - type: Projectile damage: types: - Piercing: 60 + Piercing: 50 # - type: CMArmorPiercing # amount: 20 # - type: RMCStunOnHit diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml index cfe295375b9..50811790138 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Revolvers/rs9.yml @@ -120,7 +120,7 @@ - type: Projectile damage: types: - Piercing: 65 + Piercing: 40 armorPenetration: 35 # - type: RMCProjectileAccuracy # accuracy: 90 diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml index acc95b4d686..0993c4e188c 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/m4spr_scout_rifle.yml @@ -230,7 +230,7 @@ - type: Projectile damage: types: - Piercing: 55 + Piercing: 45 # - type: CMArmorPiercing # amount: 35 # - type: RMCProjectileAccuracy @@ -250,7 +250,7 @@ - type: Projectile damage: types: - Piercing: 40 + Blunt: 40 # - type: CMArmorPiercing # amount: 50 # - type: RMCStunOnHit @@ -275,7 +275,7 @@ - type: Projectile damage: types: - Piercing: 40 + Piercing: 35 # - type: CMArmorPiercing # amount: 25 # - type: RMCProjectileAccuracy diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml index 22317d5e150..9f3f42cadf9 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Rifles/xm88_rifle.yml @@ -103,7 +103,7 @@ - type: Projectile damage: types: - Piercing: 104 + Piercing: 50 # - type: CMArmorPiercing # amount: 10 # - type: GunStacksProjectile diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml index c02ab5c91cc..e245d098a36 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/Shotguns/shotgun_pellets.yml @@ -25,7 +25,7 @@ - type: Projectile damage: types: - Piercing: 65 + Piercing: 45 - type: ProjectileSpread proto: CMPelletShotgunBuckshot count: 4 @@ -56,7 +56,7 @@ - type: Projectile damage: types: - Piercing: 70 + Piercing: 55 # - type: RMCProjectileDamageFalloff # thresholds: # - range: 8 @@ -85,7 +85,7 @@ - type: Projectile damage: types: - Heat: 55 + Heat: 40 # - type: RMCProjectileDamageFalloff # thresholds: # - range: 12 @@ -173,7 +173,7 @@ - type: Projectile damage: types: - Blunt: 55 + Blunt: 40 # - type: CMArmorPiercing # amount: 5 - type: ProjectileSpread From 6ff2f9e71fe06b7cbc2473475e7d0661ead70277 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Thu, 21 May 2026 13:23:14 -0600 Subject: [PATCH 21/21] Update grenades.yml --- .../_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml index 2cfc180d11d..1c899787c02 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Throwable/grenades.yml @@ -82,6 +82,9 @@ totalIntensity: 200 canCreateVacuum: false - type: Ammo + - type: RandomTimerTrigger + min: 1 + max: 4 # - type: CMExplosionEffect # - type: CMVocalizeTrigger # - type: RMCScorchEffect