From 25420fe374bed6248a52a04702b40788fb516f20 Mon Sep 17 00:00:00 2001 From: Scratchie Date: Tue, 23 Apr 2024 10:40:14 -0400 Subject: [PATCH 01/17] Novalite Part 1, YML and Sprites --- .../Ammunition/Magazines/novalitec1clip.yml | 48 +++++++++ .../Weapons/Guns/Rifles/novalitec1.yml | 98 ++++++++++++++++++ .../Magazine/Rifle/novalite_clip.rsi/base.png | Bin 0 -> 5642 bytes .../Rifle/novalite_clip.rsi/mag-1.png | Bin 0 -> 5359 bytes .../Rifle/novalite_clip.rsi/mag-10.png | Bin 0 -> 5485 bytes .../Rifle/novalite_clip.rsi/mag-11.png | Bin 0 -> 5492 bytes .../Rifle/novalite_clip.rsi/mag-12.png | Bin 0 -> 5495 bytes .../Rifle/novalite_clip.rsi/mag-13.png | Bin 0 -> 5509 bytes .../Rifle/novalite_clip.rsi/mag-14.png | Bin 0 -> 5510 bytes .../Rifle/novalite_clip.rsi/mag-15.png | Bin 0 -> 5524 bytes .../Rifle/novalite_clip.rsi/mag-2.png | Bin 0 -> 5384 bytes .../Rifle/novalite_clip.rsi/mag-3.png | Bin 0 -> 5419 bytes .../Rifle/novalite_clip.rsi/mag-4.png | Bin 0 -> 5444 bytes .../Rifle/novalite_clip.rsi/mag-5.png | Bin 0 -> 5463 bytes .../Rifle/novalite_clip.rsi/mag-6.png | Bin 0 -> 5468 bytes .../Rifle/novalite_clip.rsi/mag-7.png | Bin 0 -> 5472 bytes .../Rifle/novalite_clip.rsi/mag-8.png | Bin 0 -> 5478 bytes .../Rifle/novalite_clip.rsi/mag-9.png | Bin 0 -> 5486 bytes .../Rifle/novalite_clip.rsi/meta.json | 59 +++++++++++ .../Guns/Rifles/novalitec1.rsi/base.png | Bin 0 -> 5022 bytes .../Guns/Rifles/novalitec1.rsi/bolt-open.png | Bin 0 -> 5759 bytes .../novalitec1.rsi/equipped-BACKPACK.png | Bin 0 -> 5240 bytes .../Guns/Rifles/novalitec1.rsi/icon.png | Bin 0 -> 5022 bytes .../Rifles/novalitec1.rsi/inhand-left.png | Bin 0 -> 4826 bytes .../Rifles/novalitec1.rsi/inhand-right.png | Bin 0 -> 4819 bytes .../Guns/Rifles/novalitec1.rsi/mag-0.png | Bin 0 -> 196 bytes .../Guns/Rifles/novalitec1.rsi/meta.json | 35 +++++++ 27 files changed, 240 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml new file mode 100644 index 00000000000..bfa92da2c77 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -0,0 +1,48 @@ +# Empty mags +- type: entity + id: BaseMagazineNovaliteC1 + name: "High Capacity Assault Clip (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineNovaliteC1 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 15 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 16 + zeroVisible: false + - type: Appearance + +# Magazines +- type: entity + id: MagazineNovaliteC1 + name: "High Capacity Assault Clip (.20 rifle)" + parent: BaseMagazineNovaliteC1 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-15 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml new file mode 100644 index 00000000000..3f00874de23 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -0,0 +1,98 @@ +- type: entity + name: BaseWeaponNovaliteC1 + parent: BaseItem + id: BaseWeaponNovaliteC1 + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + - type: Item + size: Huge + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/novalitec1.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 + + +- type: entity + name: Novalite C1 + parent: BaseWeaponNovaliteC1 + id: WeaponRifleNovaliteC1 + description: A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Nanotrasen Representatives can not stress how compliant this rifle is. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Rifles/novalitec1.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/novalitec1.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineNovaliteC1 + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineNovaliteC1 + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..956577e3a1a9a14d6ef3669cce3d2ee7b1d507d9 GIT binary patch literal 5642 zcmeHLdr(x@9ljU>7BJ03)SBveU7DcLyL+E|AMT2>ytcZ4xK&b;srPX%TxB2Gz3VQF zi3tf7C8IISFpk=w2J0j?Oro~NA*raKQBzCt)ro~thG~rnnlx6^1d^V+JcKqg8K%fz zz%0A>oZtD*@B4m_bJ)%Kx!F?^9!)?HWQsEp z0iUXs0#q;a0~ACw6+t2&dGd=MI)zXE`X9-Q(kFF?cI!R$?Q71|P0hKSdpLO#7iiKq zbXdxh{O&gQS}z~JWS8}3&RYETOu2Pt>YwLdI=c8*v9CY&Zp*oyeSJ61tZZu7y71|j zZd}~llS_yCzDntyb9P6`@^>2ZgLB1{eTjO}g6>u4LzO*~!|p|NMRL)zn|rVPytCuA z*5toC_QhswFMZ$x?x$_r=a~{eZA!^{O-()f&)7}9UuZA?B&;>5O=H(#ti-0)CC1^Q)7*QcHJ*G-RoW0`-X>hsQb=iIt!zu6I!e(-{udIfR+ zfjsm^ec`-@s=cdY@t4tklbs)4x_GS8W;=7$zG1`r)n6>U72LQrX1_uLVW#MTEl&pBpp>^*&~>+L2gC2R4b>{)ZCFR(AXiywUSiO=b0 zmakyW%}6jW*nN~c_^-H6{!()sf2yrE_|yS@OY-#XS#c(X&Ueh7-gRVc{f-aXo@+am z*7YUT{p#7DJ&=E~O`t=^CB+{(*vC!9ttSS!dT9%i489^R-TZ0K!=vpqw zK95;cd=fB6JbsvY2x3c%_(gdg&`}8#YhJtQR^xFKswsBUYQ}}T{0>l}<&+1&%JN*d zT)s}`6;s;c1Y1Oa03M)=Xv9C@T zBiee>v^W8^1r${%$jBOifKPT)iLUzvizOTmo5PgZ7bvz6JkMKj(n69Lw7`O8UR{h} z-e8IW(T|YzdDt8knNw3+Z-~3C^Q~{(1Z^*ATonIG_U5!x9nw7Q&2MJRZyN z6+u07Jp>tW=sQ;g-LOtA1t91P1!R!99(eVX;Sh>EwB8>Ilt$?&vIUd^4>S$JU5OD} zW;2MdXRh67+SepLWWNc8SXhV z>?UJ>LGj6&B1AuOjKb2YC}M<6${5XZDkf4QjmZ?PkPOYU6ip0+a(aWh=#_y11;Nc4 z#8C*2w{mbHr2+`Sa1tib9E(|LUZoh(N|BUx7(`w`gIOt-4)@A{QXmv9DV)p_1V$6k zB^qZKjHht|!#SA-6r5E>5QS1?AOq#3_Al3yz7 zDqH|-K=UfTaPZ!gTl0XGx@hQ0umr^t9L?h-P0-eUucL^oKp+Tn(Lg0|^8gSBhd0|*ND6L4A}2{%Cs3@tD? z1|RWZ_C7^Z%f8RrC?C|;AM_k82=_0G4)xd6O7KkoQ~zVB7A+56LwSoy6)e4EC`%h0{Rf(f<8B=7E zhqO!<3#{?*rW+YX72+%Rv^Zy_GE=qtSam(I0xw&=L`X? z7=f!eOGvVnki@a4$KbHLj7Rh&TqSwH5g4#qVF*cy#5e#u9HGJ!RN^3af*Naj1BcBZ zJ)6b2YYme`%E@!ag_K(3!AG||ahAxom#$S(}_OO-wx3=N{94dEaEOi&2>Zx6k z(1a#AC`(GmukRjTerJDGQrwp6m*1OnqHYs?Wzy*#GXfW4o656dzizDR^iFx}y5n!< zN84kNJ%^^wYAy+&p}jw>YkRPGuRZOJ#B62hl}&T2&YRlm6MsAHl?#=5-&FkdkCjK} mbxvw3I5%@y^;K5>Fo}JATh^uKhhq%K5NBp?Mnn3VivIvZ2agE= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..8182b21f64d11c0d09cee0c0092adf462b64c2c5 GIT binary patch literal 5359 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 R-GE^ruC%PwZOMg|{{ha>bDRJG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png new file mode 100644 index 0000000000000000000000000000000000000000..aa689c929068eb511242d982f6f65d9c47d769d8 GIT binary patch literal 5492 zcmeHLYj6|S6<#O7P#4lkV~n9Z7TF{aSZSZ$2NDLqRU=z~0Ea;9ySsPI7V8o18p$q? z-~c7SBs@AELudm5h6w~pfj05b3^wmTlJX1<1mZHD7Dxy%JSPF%yOM3}CNmwTz%NT9 zYxmr9zkAMizjJ)GZ+MIHdnENq!Z56dyC7#Q`o^tKw?y>UsH(bwz7ACRO3bk!f``IE zO)rPISs8*jjOrSOMNj*^4L$ad-R?5E`CAjtMEh=VuMZr#_S;s0JY{7U1JC0|`KlNK*)Oex;H|NFInEPi@d;=5sL zTUocmQ!ezme@jWuT=vD$Z{!|p`{(VpH<76$CTu)=x?(OYjMNTTnf_^h=IB|5{~zZj zd6WO;*_OVw;AW!Qe^Bpk$)8kLG>*xee6>doAvI*(zkCs!nQ(UL%PEsKZsss7VXmH? z?R95ox2A*=Sv7O1t6%_wq$BVFDYP-owHcYodat@TV=-iYD(eFvrtbq%{sZtC;W zHTKofW4J@TlI%lQeIRVQnfUdW%Xg8JkJT8HH;4<9Q+Emt?-7n?*j^C`SJ$P)^ zu|1jR?=VfvJ|6#c+5ua6hH#@SbQzOvoPU3_8Q@{w2f{WWv{Ye(!y0;g}?{vyZqH4<=k>rd@2*3|bfJgo10Yi$qY%yF3U0Y^{4Uf5)(_FR^j~CAlh9S<{ zSvyJOM)m2mZA23846B+nHYcwI0^PZ6Q%y4@IUJEl#2#Vn!El*_5=GHL(hiy?kOyH@ z222no0!Eqz5y!}Zh7#68rXCF77ABB`6{gE(L*saBeEyKf(*_?fT3A4QIHDlrpzNf> z?{~DHVVJqo5lBlwKRUzkp-Od(g+{OWlGgLx>BBfD03wTm)2T>f>kt#uX`=~4^6+yAGDkwZf z5iEs5Vo8o8M3$roQczgPpivFL7?i3=dBLzBpzYNCpbR=ffwI_uMYuG|>vq{_JNdxk zEeEECCZHP718Oj0JQ(unemKqq7M~PPF+9bJ6fcUjNb(PyCcvzuGZ^*-gXJ!p6%=mGY#a8Vf>MDAa)1dDC`q#t$x1ZkqbP~v zB#I}{E!oaLsOnnf|MIrV2Y1Fdy+Ak6`js(Lyr#y%SL1i_+j2ctOgJ7Z3kfLk6bvvO zsNJ?TziDhk$$Df|cYqG$S3eq|) z5-g`e0zgV77=eZ~#c_hn{TF$UB0W}=DDg?82WdcRl*|z%Pi7FTBFF^bWPuPkj-(WY zS6Sgv?;a97MO#vT0=p;E85+z$EsmxI)LsOhAppyxwny`_s3CPC;dT_;|Gj%CJr;>m zcoON+3J^gCtD^47S>0162|?B%Ap(e6u^>{M5^rg3mHkN4<0a~e)E*5X%ID;4a z&-DBm|J?ZC%`cFt!JRY8SF%SbP3^L_G7n@J} z<~N(h-V@qCo5}AEPFm5N|M{W2#oNK1uP$V-NGn+|zIMv@HB0BrnKR0L^7o^P##@(j z8m1W1p6kV+rnc4 z222Q00yt&NqX7bxNhp*66XMbgcEG&aro`Zq;T2$*DKzDg2?ZvBxOXMn*llJqObx#* zjilXs&;9N>-}%m&t9>UwH|P1d!Ep$JJnwd8PJ+Lv`RUsme(RN$ci>M`rMJMCBvzoo zP(am60cy+%0u+Qb6+yyhefcw9IE458;U5EDOOL%;w!yfu^+Ms%js0CMxqAo1mS07T zs*ASDenD@ux5Ur)8Moek(^Z1sNt90}j`(W$Y4-ix>a=J5AMa7;9lReN{8h`UZObOk z{p0QnHNU$#Yu@q)DTztHwwALc{$Zu*#zMbbbH1d0#qOlbD@xwZUMX#{)qXwwxli_w zSowLC>%IA@t9QmE=D3BIvy?{RcB&<>_N8fCq~zAS`^L?>P&94e?K`taAxO+3Eh8h} zosrQV5Da6(+*MB3p>ac+W}RBI)H~$&`G=D;%JwW<%B^`dzA;@JweO#Wq3eTaV%SLQ ziUqS98{cjEXyLNGyI$C}0KFe` z{LNu%{hBZ4Y~()wXmxs3u0uT8>z$$X)&mcY)L+@%K&51lc`av1a{MUg=zI8%!LNQx zzd2zdb7D}Ob<~Fa+>U?u{^oq`LHv#8HToOd`K1HmS7rCMD0F^CQv8*DC0px`HNVw- zXzZ2y)Ya9;r~D%2sKdS~J@nwxyxRw6>~%2LU#Y1bcf0A6u}9{gw4U^zy?gIt-~K$L zl?rYvd-zMN@NVrLb?UODn1$yWn#!iu-kbmDB=q~O;}>6by|pgAzTclVe#s83-aKQ| zyp|g~_r80o51Kak`kq7*1IoE8h5N8A1L1wEb)c)#Ap0_4LM7K1jziraiX zTjv$JkyQ>s+8p}H6}lJJscjO_17#r@WR(NIkTp-0 z%a%EAPkzS=lY%167mTceWOuPNH1!c#U3@cVBH?s)1TOEu?PA>?d&C%8c|1a9KrS=g zb7wj&=Kg{bkTpe!Tyl)U(yAz8giOj9&2lOxQX-AX6s?d9&9f9ubb@mGbwl*az=VR} zRt@4%EC*OoA}}6j35=#G7ULz!jsce9DTZP=nc+J@6j{g)gnS}Qr{)ujfGy}RicFY<3u*aor-iiQk4ExK zMMH%PU=3(~B~YP1n(}HsFxe1IJ_(kfSc2wQhO^sgoPA{UItb}dizX_8TPb^F#!QR= z!-3R_rcxn5WE@5#WQ2fd1VY|GpwwwGokGo(9n&6IP>N`XnW6z8C{EG>P75UAB?y6` z1&YDoE#ApKplIrxpR+d02X#b~?$UI)|D4EBw5BG5H=}pa+fpr3Oeh*D3qh2lA?RW` zP$GUptmu?nEc%N8>>q7{Z6DWuLJTnHKoThq!vRBMv781l7mlc8r!e2@@HK!#IY) z30YBd-PcU+{rFCEJnc=Yl@l^W@aVWhp0I&A;bYNH07PA{+}MaST&2p+O* z9jC0eUIkO}BwuYU{z-0uqCJ~D7Qa1o_0aWL3_O-`kGgv3dMpMW%eY5f-9}g3qvtfh z5C2?Mz^5=V$M4hd2~KZmd`>3PYQ8spw!IdPJR5XP(-Gvk{^lnJS+^kp4)!tJo~%CC zo*DR}J!R3B-#b+K zi(3u-@M-mOEB^hl>1$ha{(j;?-d^$k*Vi)ErW7ohQaAI5HLI$ttJB;q@1^BVF)ynd zXX?VC@A4+}>({UKSUHkXzj^Z?nvOTX*Y1iR`!C);G$BDvO8(pES3=FP!v<6(UiHpR zTvWd{;XHG_4*l@A@dd7yaX0ogxU}N@b@6qnBL^+cnqHWECg#)T*qNsg>_p8(JTAL2 eHKA9^iwJT#xp=2m7rPclgt)VEGk2vIF8B{Cx^J%l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png new file mode 100644 index 0000000000000000000000000000000000000000..d3a7d26fee33546575cbcf7aa2b4a626bc13e5c6 GIT binary patch literal 5509 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png new file mode 100644 index 0000000000000000000000000000000000000000..9302a392790bb76f011913ef4ac6451802e40841 GIT binary patch literal 5524 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 C_)~WP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..f9767afa04cbfa666c80931f8f878f481e90a4a7 GIT binary patch literal 5444 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 P0bq{I+>9-0g%$q+QLb}o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png new file mode 100644 index 0000000000000000000000000000000000000000..b9af911cacd5b2e85048f0753bb43c57627cd0da GIT binary patch literal 5486 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..e68893a91d06ea284084bde2747d6ebc942aa40b GIT binary patch literal 5759 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..be49914432515a0fec81254cf2adb490010819ec GIT binary patch literal 5240 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 gj_L-VzTtb6Tl7yTiw^|lgX04d288+-31T@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3834b17277ba37681226f5897ac6d83468f052e3 GIT binary patch literal 5022 zcmeHKc~BE+7H=FtL~vX{WmTk&7mA&9k`6gYMD9zD!3^N4qn++f(nt=IaE^+IjtUNr z;I-(k=)$lL;(Z~5fC!EX3=3niI}GZgJ05_*;)oZxU&0~mPSuuG<9~K4>HgmF``-J# z_r6MR4-fUXwVrAXL6B`=fKLRt!^W?bCHU1RCqD(Z>SSrOAp%c;wK|QQj-_Bjl9qz0 zL|P6(i9f2sJttJcHYGjj60_FbSr6*ZWj{-kq=#5O#2-UX8@ylB_6k5}s+O~Kf+=QA@mt*NNkS@lg?#+l<2 zj&FjWo3*yz&3nk0)6bfJc3bz|i_V=-Bu{Rec@@@4xnDujTF&XCdC@M%w;hf$M|Z$S ztO9F(Xe{0$7GGP%g>TQV&UFSlUvWm!-dNA9SO55|_mt{F81#m#&5!GwhOB;;{Zt;6;bfN9TwWCy zmEF7XrW5=!FZhf50UL6>ifz6<^f&&b)WgejQ*Lz>o!Qwq77km9v_NCGmM3mG-6X!< z($w5srV#b@L6HjGf#9&vTM#tiQyO$wbjT7Bp;0k$QX`|7i7G8xkAz{|UqosMniQEH1w4|E z$#EQE6C47;_yReCb8!qIxERUdVM0C^V~>CeRO=16nxKqO0Gvq!93IM-5nPmqP&|PQ z!3co>5#VleM1WF!Qo!f)WtdHEUj8$QWyyrd4>l{7#t@0RuUeI8|1(N%mA$> zH3|B+Dk-g^mKty)pKLyx>&6%GctRn{=eP|-Z9MpQP+Cht(lqph(<+```u&fTA2sgkmBNTZ*zpm{7zP zB4CM*u-A~ZJn8>g8^;G04-`Fs)`R_%Orn9AT1u@QSPd*=Y11&luxTtrI5Cid9*?I; zQ=9;6Kt(8VwSofY$6&(_$?0Ed20m9v$#AX!K`9=FU~(|uLX0Owgajey%P5YV%@>YF z*K6d41YAdXDgcjwE6|`Ou3(qJQq3Q2pP;0SbpVtBj*tP$xTpxj7_9f79?6%>1Q<#n zB*76P7>}e7oMMv*SHPh-Y#tZ@-hYwzTcl^|h@tevEaQPVR7^4Jf66^zFyaISv<%3= z$qWv9*6>L`$d~aC&SM<5() z2n_KZ`_O!n1>64avGe&5G)5Wd<0*}mgga=y6ZKe<;6s%;LjnoOr$aX7m923fVl66&S(~*Dj zW1AjMdrjy1lumT~d~n&@nWrAT6;r)-y1jYD4@9pplkh82%$;;1vd|@eqF3&@Cz8k& zR;l*{a>1^eyjFL2_kj7=Gv?U~A0*A#6SPIJE3swF-=k05IaToDOzpD=tjUW{MPnWD z2Xw_XRaF*IQBf%^H(b&eZmg+JZh2lM{KEg}{iQArONt`79r4p<`kY>7v>!@5? zjN^LCdfqj~!OzZH&e(UcHP-EBd;3DKZ5N%w_C%CjyPdk$`RVeM3({20%A#)Z$K^YMujD-S|9AM9<83*Q y9?`MQUpGDy-$+f#Y`at)x6(T(DCowUE6(euxowcYF0un{2nG6v`W*LKz3D$amrlF@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2a27a3c3d47386f103beac1be60a56bf3b474041 GIT binary patch literal 4826 zcmeHKX;c$g7A|N|M08qYact2dw4!KbEwYpegiS#Wy9lB!l~g4}$YK^qXlxMLQL#rw zlvbM-bYQS?Ms0Um5l|3uYerN?0a2mbg+bI&KmnbXfQV=MoH?E|{f{J-)VuGy-@Es_ z_q~(a5E?vxob6;=2!h511^S1BU!m!;83n#ex^m= zCJk~a1Q~8CLSx6DgY9}BILx)&5HYo8Pl9{LsJU@0it+i@G%hKkeGeNlgq`NdeeNtbSI@qVnCe7SC4?#3`c`GK?8oD!wg_v2P&vdbMKkXNtQ>Nh8EGy1x>-CMn@@7LVYG6g=NWUf`VT_F#8 z{bTw(oUm^2L9Pp3$5y%D^L^9tNZ4a}KOx4U$@0)j2(tKE?&lX8TE&a zIpLJ*74^AUkyHK_TIK4eKfE!Eo9p3J=_{Xo^l_Z#ku%Epd=_<6MnYxf=IWBnjYkfQ zKac_USls{D-NJ{I>2GMWj;?=p_vEzBCxRz;EPVH0jbv?sBCjwH|4Nl(_-gv@ zrae6sdxY=#XvW$c;nV8l-sjWnsCCNQUEMz_PJ}>jS?VHv|7S>CSI!IRl8r7FnT-|I z`XxEt>6cvK*M$rJ)E4;FF5gnS)A|44IIh_fTab36pWUy$xzyl0fQU zF)5QP1(eQH2q;TDMRbwckBpZGrfA5Bl;B87N`iz(P`tft`34LSC`cU+8x)C3 zEoKl<%)A)5H<@V^*bLDn2q@8_P}onUAz_q?Qt3#5L7v247i%cpwejy1#P&8Ru_;2NCpG?O%H7(*r>E{ zQmfKyBxFDmsnod*rywLl{%XA@(VPw;p^=HC0zkE3RmKNP&JPlW4tba)kjWKlvlkHi z1EfwaeJ|Drv6*Jf=?o79xDWAufPR;|84OS&5$3Ow=uP1T`3oqf^)W&vkrSBtmMum( zVjc%Y7!o#tpez(c#4IrfkxB_qHe1SJqa1t~RghAv!<7=!LTpS@uCSAgjczUvN&M=A)jU03(o;W-z6BPldq;#gIm@Q@^ObNk4P%+9v zc%I;nNsxpmm%|WqQLdSakYMvv8U+r@DOcb!lBQP5%o8TTF`v*N0fkAWzqf=Y;yNjC z0DC~LBvi@T_fwH_1sS2kO?omo3>KTi;qn*^I+w>C<{w3Bw4fJFtPDDp#WuT}3WI@k zfV8-&Qvre54zj`gG$gK5X(CmsL;=MV6m0Swnihc#Mc_KzAJ>t9l+HvkI*KtFk#q*e z;$jR20*3TqcoiX+8vhsCw0&UyK+yx`TCl#+Y#P{85#*|Y(ZDcKZr)5VY~B_aE*VHc zizktUIZnVeFeQn{l`;~XAA=41&MyCrWIGu`Jzs-$_&t|^;gLl?O5YK=M&$Y^1wINq z(p@8ReUt(p1s>_H|C?O4?;oZ}CHM!F3?7xLW%=L<3>qa~INu+7YkC)y73ToU7s2v?LTETx_#oJIhQiF*^>c*Q4#G;XC-}B z(8;pcdtJ%^W<&Dz+WBEt_2|9csiQJoW14Du#8QnL0g zYF#-!{Zq^E1vajSnya`xh3|q5uTqtSOa7GNR`QQ;OJao~chD=#pSRGi0>G!fQ<}%u zw&k?yPJ6(P!jPzM72McKoO;KUi&GJ%kp9Ej4`sYfAO~M zjzUHJvgiF_Js~H&zlm*}`n1XC*S4djOI&Nu7nipv#n1D9TAH22-Rs3;zSq_#kZNH(p6k@r-G5Nf>c8`!gr&nv>$V`TE8MWZ z+Iy6*OS|g4Mc>)Jy`gs6ZtN0z%b7(vd0>Cm=Wkmkxj*hxR?;sw{z4o7Eb9x8%Kn|8 PL!qF6VE+TYaT)&shlmqR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1dd5d7c787e5a07ed6a2d437917e8ded8b19c3f2 GIT binary patch literal 4819 zcmeHKdr(tX8o#*6tBTBuKov9utx$XOCXZ`^5S|gk`w_-kxZHaK7s!JoK!7TWqE#uZ z;Gly{#TI2NN>yl8tnw1yvVgU?iU_QuQdDGBsEWEL0TE_9v*XP6KazWM@A=N}`_HR;OS|&EzH30K{B-)JX*3MWV$dkgQC``mRf?#z=N0 zwFFAm*C9Ncz`2UEWxBH_vn`(=4z6rSv^;jDV`bNhmoGTGzuy4cyJT-Z(mk`#{>Hle zKIi_q%nNpY3;mkHFQ9Grj)$dIbzuzixY^_^7n$=fILpu3`6} zj>002jW6DaG_X%lN6wsIEW1!Iaw@0ydBxa%e8*)Nf=o7%-rgY+Z|`>rfi%k2?hpku zdpfqnUMtxa;dm(Ith0C8vF+RVC7;?gipgcQzr|_#?K#ZFZnT2j3i5y@qoJI4c)EwtD&9~iv}Ny9(S9Ft6C%2e}f{fvW|UUA#<(%YG1S|BcJlE zh2+XF*G}dMh37j(Uw(Od`_s<`wK)YQ`*Bvo(!Va*E84QMTt z^^DIuO0=I>3bxtW?eH_B;+zm~C%eAdq>9}aI@WbGuju=oeYfahFQ3%TWD&1g@~ zlT)i}gzo*HTEJm>nO!!?E1%qhWZ;MJyOHuc4>}&7Q#EpzEOU(n(NYGU+M=Qz>XDu8JpUdW9NP9s~(j=+!8eOz0@_ zL;|T4Q3p@eQz;}aqDH$*8B(=3kw^w)X^8Nwpa?80857{t6&_YXJpu?6gbt%A7K!zeE}`;bD*XU3_ZqlCI+)FoE*Xcn;THAm_^`Q3Pv9P?c!Pn02L;{;CPmt z2lM&tc#Ob#ym%(VNQGmFpGu=Z!E}-eG=ZS2l?lcUgW!l)h(ttX(Z--gOGpZ;lLH5^ z21q5Y%FwdkhnUfOLSg zsG(8;fzb}KLA*5ts#9qqRH_sa)er*3;5pGP1q%vCb*K-jBLFFb#X%SxgvE?tFcA&| z0m*|VV-jA4lk&{}g*Gf7ig0Yw14u0xKhtO$TT|gg>R4;6nL-*D6NO@276^)srJzOA z3EUVb;2P_~5>aIW0rrpaf_-Nv|DYJSJO&SA@o|{RBatx71CR`81W%HTN*_;_ZrCy2WhjFC=ePSyd*UPZ!{E46OdH54Y0Myfie2~7=a!t$iK?-~jc)Gf# z<@z86J_tNrUH><^tll4{2qpLjlmU)P=0Ekl0mm$}_&|Rj=&j*fe!8+4SS-~6FW39x;D?)$sQE6k+El-=xIUhTH-D!Ti z%e()8K5&ueNT2xcI6K)yFb{ZYsKh!^9dw;NQ_40i?mVV)uhiv2JHwpZD9ib=i=!VDI zGm*d4z0D4H%WLeJ^{=5N6+3^No0BF=3!_KwnjyAWlQ0z1wYEO6+I(Y8m#g|%Q@7m@ zJ7++vKAC%8=Ggn{%&>4yW#td4sZ3LBR;aDuq_vGW@ti}{<(Z|2xjVz+^1a;BY^@o? z3r;DV_B>SKTL(uF8EhYy-}qF>IG6Owwf5*E>A(%Ve$SG1wyniftf}AOiEvKX%H>@@ zwl~Wbh%FTUxyjkeV!d}#`^_TSjU3$}LGRxAap|&^Td!-5_7DA=QgHcdRCf5L(Zi*M zy&26|yTr!S>;2^;N$)=$ebwVlTZ-+xJA-Kp@1CpkRkE(;Jsa?{dB87VFDQ&0JVSPL zXPe4`WG)4my7lOs=8oM3&l?@%Dx0@FjZSV4shAUMmL1jGV|}9T8$`aig|RU9af_wg z6Bc=B}Dr6h6Pnw)HQVAfl6 z>4w@3a);hwd5Oa%0e#-Vm>Me}T-ZueuaKDeCx~>9YzNe=H5l?7WJQJJQTy!N8_KRc zEaPlB5X$$jx!#S$4rWK8^zHYpU2N4&%vIkx-hCKkV;Z`o-o$iP<|{LkSzJ(?ki<90 Jr&=7B`yZY15YPYs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..097bee452b921ed8fb2904f8f2030dc5fd1f4ea6 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_H8nNG#KbhzR2*z9@-q`8#6=~-pE1GmOvWUggPbdvRM)YsU^=RIa0SyF jwG1tZQzy%$V;LCkxiT+eVmitL)Xd=N>gTe~DWM4fmSr<` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json new file mode 100644 index 00000000000..955dc6e8bf3 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} From 0ce984bd1fc4b9bdb0b568f00116d43fb53de99f Mon Sep 17 00:00:00 2001 From: Scratchie Date: Tue, 23 Apr 2024 10:50:11 -0400 Subject: [PATCH 02/17] novalite part 2, yml warrior recommended tag placement --- Resources/Prototypes/_NF/tags.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 20ad3a2e53c..946f4256686 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -62,4 +62,7 @@ id: DroneUsable - type: Tag - id: LightReplacer \ No newline at end of file + id: LightReplacer + +- type: Tag + id: MagazineNovaliteC1 \ No newline at end of file From 119eaa6523d5f47bf4eb4b0c52c5cbc459ed3948 Mon Sep 17 00:00:00 2001 From: Scratchie Date: Tue, 23 Apr 2024 11:35:36 -0400 Subject: [PATCH 03/17] forgot featureless grip aka sharkfin --- .../Guns/Rifles/novalitec1.rsi/base.png | Bin 5022 -> 5246 bytes .../Guns/Rifles/novalitec1.rsi/bolt-open.png | Bin 5759 -> 5974 bytes .../Guns/Rifles/novalitec1.rsi/icon.png | Bin 5022 -> 5245 bytes .../Guns/Rifles/novalitec1.rsi/mag-0.png | Bin 196 -> 4981 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png index 3834b17277ba37681226f5897ac6d83468f052e3..947d0a89b48537894ff0fe6d1e7fdf345a1c0e13 100644 GIT binary patch delta 1394 zcmV-&1&#WiC;ljqBmu>dB_Dsm4Z|=9{4+&Iuz}ck9H&X8ZqV_24kSvVoaFNX))}Dn z_x;dofU}ZL)k-TR0ot^2hp^=68|S1OZ{R2)zU1jBFj9hBJhT$;_k2DK{OVBC$;jSO zn6HJV;cqvi_((=aql+bsS{Mm?A%{Wtu~KPP&m+uhy2AX>AgMn3ZgMY=wPJhAgrqR9 zk|lvfiZ>wRC`pGNpW!$Tni3K07@%sFkxsVyQ-71~q(B_#d$H}0F~GkI zv>LYkeQevU6TtfnTxnf@tqIJ2lHTZQks~0u4P0DzHF*!X+yO?Objgq$$xBlx7J>IO z`ldWEbPEiuwR`LA3NutOF*-9cIx#VmW(Fh*GgL7#Ix{jlF)_202J8Wo z!UkLdN5IA%FCEn+Y-HZ3$_HDoPfHe+HfWn?sFH85pnV=^&elOYIA3NutOF*-9c zIx#Y{cnD|+1VWv0>67FTGJh8jAPkw~)g1r;0%}P_K~z}7?Ulhw8&MR7zX>4_2^Mo@ zGUZMyW}1X)F~LnKMFK7YE?fxR`3Cg``WQl=qYvPsbYVBeO&P@s8Uxjgmccu1Rxt#; z-8e(kh!g6jFh5+*LMT!aGx~^`uTG}*C?YeF@X@8w*ntEJ5Gbwqq z*~IsKgb*mDhDphV5SXT^ZwtvxO1{0ljg*p-cruZ5wr$gBG>C*mc>`c$ef5q#onJk+ zzI-(RDwT@v^?KCnbpMtdB*Kkt2va*W!-AEbg$P#2oV zIJj<=gM&j{w@R&6i)%JFKhkcuIX*fC7#j`4U}0fl0AQ5MWxev|WlX-bw1iR$0HqYO zv$J@fhY$iOCBE+i#QRJp6F(1{t1CTGEA9xmwkPUS?8JR&G=CZZbh}-olyTnoeUwrN zA+T*bK7?)C?C$QOway1YaG4zp1~Iws`-YTKN5qTOIhLCZj*m_`IS+aMvnlPPfsI+ zpxf;-7z}27-~aQVfTZJdRKPe`mZc*>k%%NNWRnbwr0Dni|J@xS0N+#W9-qz_9Mk^lez07*qoM6N<$g4Qs2 AdjJ3c delta 1357 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 Date: Tue, 23 Apr 2024 17:26:53 -0400 Subject: [PATCH 04/17] Removed files from base SS14 and relocated into NewFrontier folder --- .../Guns/Ammunition/Magazines/novalitec1clip.yml | 2 +- .../Objects/Weapons/Guns/Rifles/novalitec1.yml | 6 +++--- Resources/Prototypes/_NF/tags.yml | 5 ++++- .../Magazine/Rifle/novalite_clip.rsi/base.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-1.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-10.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-11.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-12.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-13.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-14.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-15.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-2.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-3.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-4.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-5.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-6.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-7.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-8.png | Bin .../Magazine/Rifle/novalite_clip.rsi/mag-9.png | Bin .../Magazine/Rifle/novalite_clip.rsi/meta.json | 0 .../Weapons/Guns/Rifles/novalitec1.rsi/base.png | Bin .../Guns/Rifles/novalitec1.rsi/bolt-open.png | Bin .../Rifles/novalitec1.rsi/equipped-BACKPACK.png | Bin .../Weapons/Guns/Rifles/novalitec1.rsi/icon.png | Bin .../Guns/Rifles/novalitec1.rsi/inhand-left.png | Bin .../Guns/Rifles/novalitec1.rsi/inhand-right.png | Bin .../Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png | Bin .../Weapons/Guns/Rifles/novalitec1.rsi/meta.json | 0 28 files changed, 8 insertions(+), 5 deletions(-) rename Resources/Prototypes/{ => _NF}/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml (92%) rename Resources/Prototypes/{ => _NF}/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml (93%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png (100%) rename Resources/Textures/{ => _NF}/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml similarity index 92% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml index bfa92da2c77..8ef5f1c191f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -20,7 +20,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml similarity index 93% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml index 3f00874de23..0857b1bc1c4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -9,7 +9,7 @@ - type: Item size: Huge - type: Clothing - sprite: Objects/Weapons/Guns/Rifles/novalitec1.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi quickEquip: false slots: - Back @@ -58,14 +58,14 @@ description: A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Nanotrasen Representatives can not stress how compliant this rifle is. Uses .20 rifle ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Rifles/novalitec1.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: Objects/Weapons/Guns/Rifles/novalitec1.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 946f4256686..78f9460ebad 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -65,4 +65,7 @@ id: LightReplacer - type: Tag - id: MagazineNovaliteC1 \ No newline at end of file + id: MagazineNovaliteC1 + +- type: Tag + id: WeaponRifleNovaliteC1 \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json From 11aa69da0e230cab21b2f5b856ad0a528175ed36 Mon Sep 17 00:00:00 2001 From: Scratchie Date: Thu, 25 Apr 2024 18:36:50 -0400 Subject: [PATCH 05/17] Updated player equipped weapon sprites --- .../novalitec1.rsi/equipped-BACKPACK.png | Bin 5240 -> 6310 bytes .../Rifles/novalitec1.rsi/inhand-left.png | Bin 4826 -> 5717 bytes .../Rifles/novalitec1.rsi/inhand-right.png | Bin 4819 -> 5253 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png index be49914432515a0fec81254cf2adb490010819ec..aff01673b18d9ce5809da52429a3aa7ad8fc6124 100644 GIT binary patch delta 2491 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 b>b#R8&MElg+>I$s&<;Tb$ zLZ3(}HaDtn1f30WgEqevQ!V-Wg>{d2lzBoYR@u|7c?;>DK3tJYr(;f#j1mg zv#t)Vf*|+-;_Tq0=puh5{x2!Ci1FaKAMfrx?%n}HtIkw2kN{N8GP0?pSSYTDp;rVj zj3A;2NzByKxrIDD$Jaf4e7%eFEbnuFjsc})GQcMiCzx(n#OuT}o0iUbpE$y*l0tk= zJYmoUi66NxyZpwv;;_IoBStVig_A(=#kN1jfY2_`Zrb+uv2C|c0RJ;^rFH!qEnxPO^k!F!9RY*ez{Pb} zllOqj9U%IoONKqLB4VKF$yzW46=GDSY26+!JiuR=)4;KCd6vm4EaVgF2v2SO@{rG;w)(fx%!1Aq0XTIQl%-b(NG7 zzVBf&nIej!Oyg=LfDi&wN(dpa-NZOKZ9+fvcbi67c6+ll`mu)y(7&p@udR^zJ2+8DoT?aSQ6~fuV2!DdW(2ceB z0_e#m31^^pSoI+b~vIw zIWi2xFbu;m48t%C!!QiPya;vpb2HDidE+fE0;Pc>H&vJ;(kd{LS%{Wn}5-Pukf6f<>b?@ty*U2BAI?FWK7br6#xUQ>;B>&$S hC+hre!7$9*P^Vbm`r#ymEihu1R($^Gr&C~t&MaSq?CHdECz`(? z_9NsEVQeH!Ru^h61eru~fj++#OS5|Y!m`CXY+4u&b=N*cet&DNyxyAGgvf@3NDq{` z0ETHmXQK3i%)ta>4#rL^z6lTV?@kB87vy_c9-tnG{Qv*~glR)VP)S2WAaHVTW@&6? z004NLeUUv#!$2IxUq7TG6$dM*bjVPhtb>X;mMRv(LTM|s>R@u|7c^-|Qd}Gb*Mfr| zi&X~~XI&j!1%E;C1H{?ENzp}0{9jUN5#zyeKi=JY+`R+5%_>t2e+*DmQ%@)2LN325 z1YY6C2!=3;u*eK8nOV%jb$s2!!`Hhg&vHNa=jfLU1_L|-ag1rYNxVTkyJ>2i_lZNS zEXu^^#1lGQkob}7lEZJDOE!CXW=PMb=ZQnaLaB?TE`MfaT_K(!j>w8i`QDtvGUqMM zO0~|~_v9}O7Sxpt*J*~4z!H*3L4brhDyYIllvb4#18LfiyZA?Ke~MfZxhi1fSU?R5 zMB5Mk2fw>Diqlh0QZNqmyja%97!cS6S`EwkKDMmZ3E+DMuGEgd)&%B0NpEzt$PqBG z4P0DzG)8F;xZDATpEOYyZOKQ|TPyP;Ix{gkF*dW41`Pp|!3JC;WiT^hWHe=AEip1n zWim20lR*bf3^i0SI65&gIxsmRFO$0lVkBiWIWsV3WH&7_Wo0uhG%;p0Ejc(gGc95> zW;HlsH8D0gGiH-P2Tck!R53U@Gch_bHnW%qXb1#Y6$jOm1Q0TR85SQ9CKODf0007U zNkl~lU6rF-bELObF1=Oa0rnkM;)!;bci;gc?Gte1NVHk) z1xg~T7;&uR9;mGllI2fK*Nf(NvJgq;`!b#+ngKu%1VIo4K@bE%kPpe1&!6<*$9H|s zv5jN@$QaYUioYFy+}O2q1B4KoF{U}^UW=d3=FsnTPd1@>NW4-Cd=zgOM-#jL_4^O> zzHwMAGn=((ng(YZpp=5)@D8Hr38a+XiC-+UqBwV3fH9_h7GFi0rFK0W-W{x6K~>u4 z#Ve(@CqIx*J|TqAlu{TBe!~6z2nZn%$8m7b0LGXmgurHhy@FP|14=0%gn&}&Ll|J< zH*x26l*Qku65sE2VY6NVAp|I;KnU^nQJ5zmZ&62C{LM1)w}TrPN0V)l*;Z6dDK*=` zYXc~yAf?QwyEb|V=>P!iJQ*5!=Zs@ke2&6Ny`@;N7t1UdN0XgQ*sB4iU`Q!pvtE@w zUasPGxz+A}>}5!^B5kgY;&zVX7(b#A1VIo4K@bE%5ClOG1gYkn-n(mr5YA(094o%x z>tY5Je+$D9=n d1VLOD^A|y!dXAHF3uXWS002ovPDHLkV1g?7fqVb} delta 1373 zcmV-j1)}4)4?Cw|~}(?QIL1!n{kCgeX$x z0Md_=G!R8(!8*V*xFYwy$0S(DzdaqGFXBO26dB(m_5c6@glR)VP)S2WAaHVTW@&6? z004NLeUUv#!$2IxU(=R~R2-~O#34gR@u|7c?;>DK3tJYr(;f z#j1mgv#t)Vf`1_R0pjf7r060g{x2!Ci1FaKAMfrx?%n}HtIkw2kN{N8GP0?pSSYTD zp;rVjj3A;2NzByKxrIDD$Jaf4e7%eFEbnuFjsc})GQcMiCzx(n#OuT}o0iUbpE$y* zl0tk=JYmoUi66NxyZpwv;;_IoBStVig_A(=#kN1jfY2_`Zrb+uv2C|c0RJ;^rFH!qEnxPO^k!F!9RY*e zz{Pb}lScP|%N-#4q)Ue6NPe0^xeUCY(Ki)=p2&&`~ZgN1@r(RHdrAS zU($tojSr=l?WL=(RjZOMIhK?8PQsSg^UuzV)}8?ff*=TjAP9mW2;wMt`J$_bAK&U- zK7ZRNdZQ3R*H!%cH&2r5${pbQz7|4g&Ur1x_j?`u{H5{f>lEkjx?4M;ktbd$g*u8i zjKVoa;T!<)E&PG*bG}v7y8nAqDTTq{4CC=7q?EN2e|0@|QZH4P0zwE~XYpCweZNbt z2ZOWRC~&gE-WIQv0su@V6X#eQ;rqV!Jbw?Tr>}8wF$7}_Q4~434iG|U#u!%11)8lk zlu}@fK`C_<4lwo`yKNnt>~Ca=@Ao=bEf-*n!Sg&Y#%lX0w6X0?>)2$!np>9cIF2(Lk5%u!Y0}<%1Xxa3BaUNm&an@}(wL6*!5m`o8_Q6;|t1Ppom1_2B<00000NkvXXu0mjfpV@St From 05110294093684e17915c9cffdc09f4fb2378201 Mon Sep 17 00:00:00 2001 From: Scratchie Date: Fri, 26 Apr 2024 00:56:05 -0400 Subject: [PATCH 06/17] tags appears to be missing hoverbikekeys, hopefully this fixes --- Resources/Prototypes/_NF/tags.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 78f9460ebad..8ed4f9fa6ed 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -65,7 +65,11 @@ id: LightReplacer - type: Tag - id: MagazineNovaliteC1 + id: HoverbikeKeys + +- type: Tag + id: WeaponRifleNovaliteC1 - type: Tag - id: WeaponRifleNovaliteC1 \ No newline at end of file + id: MagazineNovaliteC1 + \ No newline at end of file From ba86aa062737b350a14d3af9a85cbcd84bc94858 Mon Sep 17 00:00:00 2001 From: Scratchie Date: Sat, 27 Apr 2024 23:46:30 -0400 Subject: [PATCH 07/17] Renamed Magazine to more accurate match what it is --- .../Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml index 8ef5f1c191f..2d4944c995c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -1,7 +1,7 @@ # Empty mags - type: entity id: BaseMagazineNovaliteC1 - name: "High Capacity Assault Clip (.20 rifle)" + name: "Novalite En Bloc (.20 rifle)" parent: BaseItem abstract: true components: @@ -35,7 +35,7 @@ # Magazines - type: entity id: MagazineNovaliteC1 - name: "High Capacity Assault Clip (.20 rifle)" + name: "Novalite En Bloc (.20 rifle)" parent: BaseMagazineNovaliteC1 components: - type: BallisticAmmoProvider From 58395e5f5767dbbb3a1db367342dcb7398fedefc Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 6 Jul 2024 06:29:12 +0300 Subject: [PATCH 08/17] updates, clean up and exped loot integration --- .../Fills/Items/weapon_cases_expedition.yml | 13 ++++ .../Spawners/Random/dungeon_items_weapons.yml | 1 + .../Ammunition/Magazines/novalitec1clip.yml | 20 +----- .../Weapons/Guns/Rifles/novalitec1.yml | 65 +++--------------- .../Objects/Weapons/Guns/expedition_guns.yml | 5 ++ .../Guns/Rifles/novalitec1.rsi/meta.json | 10 ++- .../novalitec1.rsi/wielded-inhand-left.png | Bin 0 -> 820 bytes .../novalitec1.rsi/wielded-inhand-right.png | Bin 0 -> 870 bytes 8 files changed, 39 insertions(+), 75 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index 76749b1ef4e..9d1b2de160f 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -237,6 +237,19 @@ - id: MagazineRifleLowCapacity amount: 3 +- type: entity + parent: WeaponCaseLong + id: WeaponCaseLongWeaponRifleNovaliteC1Expedition + suffix: Dungeon, NovaliteC1 + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRifleNovaliteC1Expedition + amount: 1 + - id: MagazineNovaliteC1 + amount: 2 + - type: entity parent: WeaponCaseLong id: WeaponCaseLongLecterExpedition diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index a4ad207280e..046957bf98f 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -179,6 +179,7 @@ - WeaponCaseShortDeckardExpedition - WeaponCaseShortPython - WeaponCaseLongGestioExpedition + - WeaponCaseLongWeaponRifleNovaliteC1Expedition - WeaponCaseLongKammererExpedition - WeaponCaseLongEnergyGunExpedition - WeaponCaseLongRepeaterExpedition diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml index 2d4944c995c..3b774acd52a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -1,9 +1,8 @@ # Empty mags - type: entity - id: BaseMagazineNovaliteC1 + parent: BaseMagazineRifle + id: MagazineNovaliteC1 name: "Novalite En Bloc (.20 rifle)" - parent: BaseItem - abstract: true components: - type: Tag tags: @@ -31,18 +30,3 @@ steps: 16 zeroVisible: false - type: Appearance - -# Magazines -- type: entity - id: MagazineNovaliteC1 - name: "Novalite En Bloc (.20 rifle)" - parent: BaseMagazineNovaliteC1 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifle - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-15 - map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml index 0857b1bc1c4..7d1a4f29d47 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -1,60 +1,7 @@ - type: entity - name: BaseWeaponNovaliteC1 - parent: BaseItem - id: BaseWeaponNovaliteC1 - description: A rooty tooty point and shooty. - abstract: true - components: - - type: Sprite - - type: Item - size: Huge - - type: Clothing - sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: AmmoCounter - - type: Gun - fireRate: 4 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: StaticPrice - price: 500 - - -- type: entity - name: Novalite C1 - parent: BaseWeaponNovaliteC1 + parent: BaseWeaponRifle id: WeaponRifleNovaliteC1 + name: Novalite C1 description: A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Nanotrasen Representatives can not stress how compliant this rifle is. Uses .20 rifle ammo. components: - type: Sprite @@ -67,8 +14,14 @@ - type: Clothing sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi - type: Gun + fireRate: 2 # 4->2 + selectedMode: SemiAuto + availableModes: + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + params: + variation: 0.125 - type: ItemSlots slots: gun_magazine: @@ -95,4 +48,4 @@ magState: mag steps: 1 zeroVisible: true - - type: Appearance \ No newline at end of file + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml index 100f6eeaa80..b0641a0a6a9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml @@ -51,6 +51,11 @@ noSpawn: true id: WeaponRifleGestioExpedition +- type: entity + parent: [ WeaponRifleNovaliteC1, UnregisteredFirearmBase ] + noSpawn: true + id: WeaponRifleNovaliteC1Expedition + # SMGs - type: entity parent: [ WeaponSubMachineGunWt550, UnregisteredFirearmBase ] diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json index 955dc6e8bf3..70e934ec946 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111 | wielded-inhand-right and wielded-inhand-left sprites made by Stagnation (discord) and those two sprites specifically are under CC-BY-NC-SA-3.0", "size": { "x": 32, "y": 32 @@ -30,6 +30,14 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1a20b9c047cf8b62e805f0f66565822e54ed0492 GIT binary patch literal 820 zcmV-41Izr0P)Px%)Ja4^RCt{2+QCcPP#g#FZ-%7~dKeXc?MORm<_0lf@iIma8-)Zt6m}Opi+bE2 zAUlga49YIv{10RYrNVB*TPcD?M+$C~VIVzu_P0YxFt)ahrrM6*=hP(c{qpi&lgsx3 zLI@#*5JCtcgpY{0-*wBf`d%LggPs8Zp7rWvSr+H>`GJMk*49|p^|74@$8i+Pvbf(w zD7Q}#5hoG}Y_2W=04jTj0DyQr4ggS96|Gh)@H>;qz_x9_4*-1r@~x|OSQ{%Pe*GpJ zs-~uC+-x?Lo5xpIS8yDsXWyxt2c~KA$;k--!2b0o(6C(I1^}F$ouSb<4_wRTa;Vqq zDDUoL@$D>Ly-W@o=THugPq7T(_un>Z=NI>`qbLeY)8wP0qpnHlI+04HIGIesbzRKN z%%IU|C_ra&yw$GP>w!M8SPTF_L~tAjtyb&7s}FQmZ+5pS%NxKu3g&el4YiUn3xb!6XzVQZ&SsX#j-Vj`Npt9_^$ z&1SQlNF)FNuIu{mRjF8D0QmmnXCy2C5VyYpkrqy;(_{O^_ZWu3nx;iNPQx%J;^BeL zSf6?fLI@#*5JCtcgb+dqA^uyF5R>=Q6_59G*Tar;L_SEU2uag4-dtTmW$zI2csvl5 zXEGTq7v=y&6OH#`Sr%8T)ktek4Q|q5nkF}!O+Pj-m$&_>+_r7xaygWD_wniDVwB?x zux%SVTkG6w0lXADtWcf2zq;$XSXfwqq9}e;9*f05L{MKmA4y2+Ex_{oc^n*{qEh)9 zSb$#H|1d&z@}hCaaTHzG*>zn2z&m3O#SeLuclRUP8_>(31sLVMyBLPSx~}{C1-yv- zv3U0;B7cvBsu($48!2->+8Tig-7+2ak-{x(eDA6G?TJlK?os)5Mpfo y1A_%9ac;uN)Bpeg4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px&21!IgRCt{2+QCcPP#g#FZ^lG-8x6c>JeedByCoiRkw}Yfq(VC^766-h6id{797WsNgjqVCLPC- zVHhfDNqla%Lq zH?9rCkmu*;4=%`Htlnu0A3tvo?GtMOywetb{qErV&kOW=J?Od)DJ4wPglU=p03qfu zKR*uusMp{1`$ZH*fo7zbB^dCg%GmcZbMa7bUGbeUS7tUFQ3oLTrP)`las`sK&e!c zVHlz`H-qDgKZvtyV&k04TD2_KS65`MT9$9$)cW5xV@%q%edl-17?X^#skrkn#-?tc z8TouZ))~S%Pjql5UY%OCECFEq;7|dsA5K+O0KnDN6MS1w0!!!844*=ktBM1U?yIs_m7O=6oJ92i`Fbo-uH90xip927F6{ zJPQDL|KU@rc~b8H@3aNCu?1b%!8u2zQbDb@2-jWfw*%Mt{pxJB!0463T zz!(F6{;Z#^PHNtMQ1p-_-Qh<;H Date: Sat, 6 Jul 2024 06:46:34 +0300 Subject: [PATCH 09/17] magazine-clip --- .../Ammunition/Magazines/novalitec1clip.yml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml index 3b774acd52a..6575c9b626e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -1,8 +1,9 @@ # Empty mags - type: entity parent: BaseMagazineRifle - id: MagazineNovaliteC1 - name: "Novalite En Bloc (.20 rifle)" + id: MagazineNovaliteC1Empty + name: "Novalite En Bloc (.20 rifle any)" + suffix: empty components: - type: Tag tags: @@ -30,3 +31,18 @@ steps: 16 zeroVisible: false - type: Appearance + +- type: entity + parent: MagazineNovaliteC1Empty + id: MagazineNovaliteC1 + name: "magazine (.20 rifle)" + suffix: full + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] From 0375894ec6f085c384ae93410f6608a874eaccc6 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 6 Jul 2024 07:04:09 +0300 Subject: [PATCH 10/17] fire rate --- .../_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml index 7d1a4f29d47..78a1278bf26 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -14,7 +14,7 @@ - type: Clothing sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi - type: Gun - fireRate: 2 # 4->2 + fireRate: 3 # 4->3 selectedMode: SemiAuto availableModes: - SemiAuto From 365960fc9653e057de92c06e53cce9b5809a7ade Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 6 Jul 2024 07:14:29 +0300 Subject: [PATCH 11/17] actually 4 is fine --- .../_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml index 78a1278bf26..b3984c33eeb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -14,7 +14,7 @@ - type: Clothing sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi - type: Gun - fireRate: 3 # 4->3 + fireRate: 4 selectedMode: SemiAuto availableModes: - SemiAuto From d44dd3960380589201fd7dc3b5eb7d987c6baa4b Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 11 Jul 2024 14:07:59 +0300 Subject: [PATCH 12/17] replaced mosin merc with novalite merc --- .../Prototypes/Procedural/salvage_factions.yml | 2 +- .../Fills/Backpacks/npc_loot_mercenaries.yml | 16 +++++++++++----- .../Clothing/Hands/gloves_mob_hostile_npcs.yml | 15 +++++++++++++++ .../Spawners/Random/mobs_hostile_mercenaries.yml | 2 +- .../Mobs/NPCs/mob_hostile_mercenaries.yml | 10 ++++++---- .../_NF/Roles/Jobs/Hostile/mercenaries.yml | 6 +++--- .../MobsHostileExpedition/mercenaries.xml | 6 +++--- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 1ebbe75cc60..99815bb9764 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -323,7 +323,7 @@ amount: 1 prob: 0.1 - entries: - - id: MobMercenarySoldierMosin + - id: MobMercenarySoldierNovalite amount: 2 maxAmount: 4 prob: 0.05 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml index d5638fd38e3..397be0d55dd 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml @@ -97,7 +97,7 @@ - type: entity parent: MercenaryDuffelGiftBox - id: ClothingBackpackDuffelMecranaryTier1Mosin + id: ClothingBackpackDuffelMecranaryTier1Novalite noSpawn: true components: - type: SpawnItemsOnUse @@ -110,7 +110,7 @@ - id: SpaceCash500 prob: 0.45 # Weapons - - id: WeaponSniperMosin + - id: WeaponRifleNovaliteC1 prob: 0.9 # Armor - id: ClothingOuterVestWebMercenary @@ -137,14 +137,20 @@ - type: entity parent: MercenaryWebbingBox - id: ClothingBeltWebbingMecranaryTier1Mosin + id: ClothingBeltWebbingMecranaryTier1Novalite noSpawn: true components: - type: SpawnItemsOnUse items: - - id: MagazineBoxLightRifle + - id: MagazineBoxRifle + prob: 0.9 + - id: MagazineNovaliteC1Empty + prob: 0.9 + - id: MagazineNovaliteC1Empty prob: 0.9 - - id: MagazineBoxLightRifleBig + - id: MagazineNovaliteC1 + prob: 0.2 + - id: MagazineBoxRifleBig prob: 0.2 sound: path: /Audio/Items/jumpsuit_equip.ogg diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml index 2e61b05527b..e3e1f80bb7e 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml @@ -162,6 +162,21 @@ - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi state: wielded-inhand-right +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorMercNovalite + name: combat gloves + suffix: novalite + noSpawn: true + components: + - type: Clothing + clothingVisuals: + gloves: + - sprite: Clothing/Hands/Gloves/mercbattle.rsi + state: equipped-HAND + - sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + state: wielded-inhand-right + - type: entity parent: ClothingHandsGlovesColorBlackSMG id: ClothingHandsGlovesColorMercHatchet diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml index d6c309d5a28..44137932c49 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml @@ -29,7 +29,7 @@ prototypes: - MobMercenarySoldierKnife - MobMercenarySoldierPistol - - MobMercenarySoldierMosin + - MobMercenarySoldierNovalite chance: 1 offset: 0.0 rarePrototypes: diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml index 4d975cc9b87..354d72cd890 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml @@ -151,7 +151,7 @@ - type: entity name: mercenary soldier parent: MobMercenaryBase - id: MobMercenarySoldierMosin + id: MobMercenarySoldierNovalite # No mosin: novalite rifle now description: Low-ranking soldiers armed with a variety of surplus weapons. noSpawn: true components: @@ -179,18 +179,20 @@ color: "#a9b6bd" shader: unshaded - type: BasicEntityAmmoProvider - proto: CartridgeLightRifle + proto: CartridgeRifle capacity: 10 count: 10 - type: Gun showExamineText: false - fireRate: 0.65 + fireRate: 0.85 minAngle: 1 maxAngle: 10 selectedMode: SemiAuto availableModes: - SemiAuto - soundGunshot: /Audio/Weapons/Guns/Gunshots/sniper.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + params: + variation: 0.125 ## Tier 2 - type: entity diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml index 01db2de3bf2..420aad7f8a1 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml @@ -18,9 +18,9 @@ - type: startingGear id: MobHumanoidMercenaryGearRangedAltT1 equipment: - gloves: ClothingHandsGlovesColorMercMosin - back: ClothingBackpackDuffelMecranaryTier1Mosin - belt: ClothingBeltWebbingMecranaryTier1Mosin + gloves: ClothingHandsGlovesColorMercNovalite + back: ClothingBackpackDuffelMecranaryTier1Novalite + belt: ClothingBeltWebbingMecranaryTier1Novalite shoes: ClothingShoesBootsMercenary # Tier 2 diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml index 73ab433d20e..24b1fca2e8c 100644 --- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml +++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml @@ -37,13 +37,13 @@ [bold][color=#a4885c]________________________________________________________________________[/color] - + - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death) - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s) - - [bold][color=#a4885c]Damage (type):[/color][/bold] 19 [color=yellow]Piercing[/color] (.30 round) + - [bold][color=#a4885c]Damage (type):[/color][/bold] 17 [color=yellow]Piercing[/color] (.20 round) - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 25%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 10% - - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (Kardashev-Mosin) + - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (Novalite C1) [bold][color=#a4885c]________________________________________________________________________[/color] From 25ae9a6d6f85af97f2db18bd41707f031739597f Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 11 Jul 2024 14:15:19 +0300 Subject: [PATCH 13/17] fix --- .../_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml index 354d72cd890..531a5008ef9 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml @@ -191,8 +191,8 @@ availableModes: - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - params: - variation: 0.125 + params: + variation: 0.125 ## Tier 2 - type: entity From fbb3de72e0561847dfde086e0fd567e401fbe716 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 11 Jul 2024 14:19:58 +0300 Subject: [PATCH 14/17] very fixed now --- .../_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml index 531a5008ef9..57e51292435 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml @@ -191,8 +191,6 @@ availableModes: - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - params: - variation: 0.125 ## Tier 2 - type: entity From a277f59f92bb80ac527d9cc55279910adc20bd1d Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jul 2024 16:30:53 +0300 Subject: [PATCH 15/17] End me --- .../VendingMachines/Inventories/ammo.yml | 12 ++++--- .../Inventories/lesslethalvend.yml | 2 +- .../Guns/Ammunition/Magazines/light_rifle.yml | 30 +++++++++--------- .../Ammunition/Magazines/novalitec1clip.yml | 4 +-- .../{rifle_lowcap.yml => rifle_low.yml} | 27 +++++++++++++--- .../Ammunition/SpeedLoaders/heavy_rifle.yml | 3 ++ .../Weapons/Guns/Battery/battery_guns.yml | 4 +-- .../Objects/Weapons/Guns/Rifles/gestio.yml | 6 ++-- .../Rifle/rifle_cap_mag.rsi}/base.png | Bin .../Rifle/rifle_cap_mag.rsi}/mag-1.png | Bin .../Rifle/rifle_cap_mag.rsi}/meta.json | 0 .../Rifle/rifle_cap_mag.rsi}/practice.png | Bin .../Magazine/Rifle/rifle_cap_mag.rsi}/red.png | Bin .../Rifle/rifle_cap_mag.rsi}/rubber.png | Bin .../Rifle/rifle_cap_mag.rsi}/uranium.png | Bin .../Magazine/Rifle}/svt40.rsi/base.png | Bin .../Magazine/Rifle}/svt40.rsi/mag-1.png | Bin .../Magazine/Rifle}/svt40.rsi/meta.json | 0 .../Magazine/Rifle}/svt40.rsi/practice.png | Bin .../Magazine/Rifle}/svt40.rsi/red.png | Bin .../Magazine/Rifle}/svt40.rsi/rubber.png | Bin .../Magazine/Rifle}/svt40.rsi/uranium.png | Bin .../Projectiles/emp.rsi}/base.png | Bin .../emp.rsi}/equipped-BACKPACK.png | Bin .../Projectiles/emp.rsi}/icon.png | Bin .../Projectiles/emp.rsi}/inhand-left.png | Bin .../Projectiles/emp.rsi}/inhand-right.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-0.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-1.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-2.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-3.png | Bin .../Projectiles/emp.rsi}/mag-unshaded-4.png | Bin .../Projectiles/emp.rsi}/meta.json | 0 .../Rifles/gestio.rsi}/base.png | Bin .../Rifles/gestio.rsi}/bolt-open.png | Bin .../Rifles/gestio.rsi}/equipped-BACKPACK.png | Bin .../gestio.rsi}/equipped-SUITSTORAGE.png | Bin .../Rifles/gestio.rsi}/icon.png | Bin .../Rifles/gestio.rsi}/inhand-left.png | Bin .../Rifles/gestio.rsi}/inhand-right.png | Bin .../Rifles/gestio.rsi}/mag-0.png | Bin .../Rifles/gestio.rsi}/meta.json | 0 .../gestio.rsi}/wielded-inhand-left.png | Bin .../gestio.rsi}/wielded-inhand-right.png | Bin 44 files changed, 56 insertions(+), 32 deletions(-) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/{rifle_lowcap.yml => rifle_low.yml} (68%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/mag-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/practice.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/red.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/rubber.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Low-Cap-Rifle-Magazine.rsi => Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi}/uranium.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/mag-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/practice.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/red.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/rubber.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Ammunition => Guns/Ammunition/Magazine/Rifle}/svt40.rsi/uranium.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-0.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-2.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-3.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/mag-unshaded-4.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{EMP-Gun.rsi => Guns/Projectiles/emp.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/bolt-open.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/mag-0.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/wielded-inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/{Gestio-Rifle.rsi => Guns/Rifles/gestio.rsi}/wielded-inhand-right.png (100%) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 9b4aef4996c..4f8e10fc938 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -3,8 +3,10 @@ startingInventory: SurvivalKnife: 10 WeaponLaserPistolNF: 10 # Frontier - WeaponSniperMosin: 10 - WeaponSniperRepeater: 10 +# WeaponSniperMosin: 10 + WeaponRifleGestio: 10 +# WeaponSniperRepeater: 10 + WeaponRifleNovaliteC1: 5 MagazineBoxLightRifle: 10 MagazineBoxLightRiflePractice: 10 MagazineBoxLightRifleRubber: 15 @@ -13,11 +15,11 @@ BoxShotgunSlug: 10 BoxLethalshot: 10 BoxBeanbag: 10 - BoxShotgunPractice: 10 MagazineBoxRifle: 10 MagazineBoxRifleRubber: 15 MagazineBoxMagnum: 10 - SpeedLoaderRifleHeavy: 10 - SpeedLoaderRifleHeavyRubber: 10 + SpeedLoaderRifleHeavyEmpty: 10 + MagazineNovaliteC1Empty: 10 + MagazineRifleLowCapacityEmpty: 10 emaggedInventory: WeaponPistolViper: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 9086abe8c7d..ea66484677a 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -2,7 +2,7 @@ id: LessLethalVendInventory startingInventory: WeaponDisabler: 10 - Kardashev-MosinNonlethal: 10 +# Kardashev-MosinNonlethal: 10 WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index a61a9c66969..0bea7905ab4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -24,7 +24,7 @@ proto: CartridgeLightRifle capacity: 10 - type: Sprite - sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi - type: entity id: 10roundmagazineempty @@ -49,19 +49,19 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -# type: entity to be added back when Rubber rounds are added. - # id: 10roundmagazineRubber - #name: "10 round magazine(.30 rifle rubber)" - #parent: 10roundmagazine - #components: - # type: BallisticAmmoProvider - # proto: CartridgeLightRifleRubber - #type: Sprite - #layers: - # state: rubber - #map: ["enum.GunVisualLayers.Base"] - #state: mag-1 - #map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: 10roundmagazineRubber + name: "10 round magazine(.30 rifle rubber)" + parent: 10roundmagazine + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: entity id: 10roundmagazinePractice @@ -85,4 +85,4 @@ - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary - type: Sprite - sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml index 6575c9b626e..c9866174540 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -2,7 +2,7 @@ - type: entity parent: BaseMagazineRifle id: MagazineNovaliteC1Empty - name: "Novalite En Bloc (.20 rifle any)" + name: "clip (.20 rifle any)" suffix: empty components: - type: Tag @@ -35,7 +35,7 @@ - type: entity parent: MagazineNovaliteC1Empty id: MagazineNovaliteC1 - name: "magazine (.20 rifle)" + name: "clip (.20 rifle)" suffix: full components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml similarity index 68% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml index 36ad148c41b..9e93b0dd01f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml @@ -1,6 +1,23 @@ +- type: entity + id: MagazineRifleLowCapacityEmpty + name: "low cap magazine (.20 rifle any)" + suffix: empty + parent: MagazineRifle + components: + - type: BallisticAmmoProvider + proto: null + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: entity id: MagazineRifleLowCapacity - name: "magazine Low-Cap (.20 rifle)" + name: "low cap magazine (.20 rifle)" parent: BaseMagazineRifle components: - type: BallisticAmmoProvider @@ -9,7 +26,7 @@ - type: Item size: Tiny - type: Sprite - sprite: _NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi layers: - state: red map: ["enum.GunVisualLayers.Base"] @@ -18,7 +35,7 @@ - type: entity id: MagazineRifleLowCapacityPractice - name: "magazine Low-Cap (.20 rifle practice)" + name: "low cap magazine (.20 rifle practice)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider @@ -35,7 +52,7 @@ - type: entity id: MagazineRifleLowCapacityRubber - name: "magazine Low-Cap (.20 rifle rubber)" + name: "low cap magazine (.20 rifle rubber)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider @@ -52,7 +69,7 @@ - type: entity id: MagazineRifleLowCapacityUranium - name: "magazine Low-Cap (.20 rifle uranium)" + name: "low cap magazine (.20 rifle uranium)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml index 2fea05d787b..de5c79ba318 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -49,6 +49,9 @@ components: - type: BallisticAmmoProvider proto: null + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: base - type: Sprite sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi layers: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 87f0a10568d..4d4d422320e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -5,7 +5,7 @@ description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells, has a slow self charging nuclear powered battery. components: - type: Sprite - sprite: _NF/Objects/Weapons/EMP-Gun.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/emp.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -13,7 +13,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: _NF/Objects/Weapons/EMP-Gun.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/emp.rsi - type: Gun fireRate: 1 selectedMode: SemiAuto diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml index f9f22136860..6e29bf58b56 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml @@ -5,14 +5,14 @@ description: An old prototype burst-fire NanoTrasen marksman rifle. Manufactured by Silver Industries. It hasn't ever left the trials. Given it's antiquity it is considered a civilian grade weapon. Uses .20 rifle ammo. components: - type: Sprite - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi - type: Gun fireRate: 3.75 projectileSpeed: 30 @@ -25,6 +25,8 @@ - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle3.ogg + params: + volume: -5 - type: Wieldable - type: GunWieldBonus minAngle: -2 diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/mag-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/practice.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/practice.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/red.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/red.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/red.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/rubber.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/rubber.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/uranium.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/uranium.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/uranium.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/mag-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/mag-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/practice.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/practice.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/red.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/red.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/rubber.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/rubber.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/uranium.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/uranium.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-2.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-3.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-4.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/mag-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png From 79a4b73072595969bcea4cdfe86bd65b5e3181c5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jul 2024 16:38:18 +0300 Subject: [PATCH 16/17] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 4d4d422320e..b1a113efda0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -5,7 +5,7 @@ description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells, has a slow self charging nuclear powered battery. components: - type: Sprite - sprite: _NF/Objects/Weapons/Guns/Rifles/emp.rsi + sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -13,7 +13,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: _NF/Objects/Weapons/Guns/Rifles/emp.rsi + sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi - type: Gun fireRate: 1 selectedMode: SemiAuto From 1d69241a2c261041a4fe641ba456b7dbae2a07ec Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 13 Jul 2024 19:03:25 +0300 Subject: [PATCH 17/17] Update security_uplink_catalog.yml --- Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index c793cb2d795..5ddff0e8283 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -229,7 +229,7 @@ name: uplink-security-emitter-name description: uplink-security-emitter-desc productEntity: WeaponEmpEmitter - icon: { sprite: _NF/Objects/Weapons/EMP-Gun.rsi, state: icon } + icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi, state: icon } cost: FrontierUplinkCoin: 1 categories: