From 6622fc8cb3e87dc426204067c13c14280d97763e Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Tue, 20 Jun 2023 15:51:32 -0300 Subject: [PATCH 01/43] guns, here the problematic anti material rifle 3 assault rifles, 2 SMG and 1 pistol added, if i get the "RSI not found" error i could add the rest of the guns --- .../Objects/Weapons/Guns/Pistols/pistols.yml | 20 +++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 134 ++++++++++++++++++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 68 +++++++++ .../Objects/Weapons/Guns/Snipers/snipers.yml | 17 +++ .../Guns/Pistols/10mmPIPEpistol.rsi/base.png | Bin 0 -> 464 bytes .../Guns/Pistols/10mmPIPEpistol.rsi/icon.png | Bin 0 -> 519 bytes .../10mmPIPEpistol.rsi/inhand-left.png | Bin 0 -> 424 bytes .../10mmPIPEpistol.rsi/inhand-right.png | Bin 0 -> 447 bytes .../Guns/Pistols/10mmPIPEpistol.rsi/mag-0.png | Bin 0 -> 209 bytes .../Guns/Pistols/10mmPIPEpistol.rsi/meta.json | 28 ++++ .../Guns/Rifles/assaultcarbine.rsi/base.png | Bin 0 -> 550 bytes .../assaultcarbine.rsi/equipped-BACKPACK.png | Bin 0 -> 866 bytes .../Guns/Rifles/assaultcarbine.rsi/icon.png | Bin 0 -> 563 bytes .../Rifles/assaultcarbine.rsi/inhand-left.png | Bin 0 -> 656 bytes .../assaultcarbine.rsi/inhand-right.png | Bin 0 -> 680 bytes .../Guns/Rifles/assaultcarbine.rsi/mag-0.png | Bin 0 -> 188 bytes .../Guns/Rifles/assaultcarbine.rsi/meta.json | 33 +++++ .../Guns/Rifles/chineserifle.rsi/base.png | Bin 0 -> 690 bytes .../chineserifle.rsi/equipped-BACKPACK.png | Bin 0 -> 979 bytes .../Guns/Rifles/chineserifle.rsi/icon.png | Bin 0 -> 721 bytes .../Rifles/chineserifle.rsi/inhand-left.png | Bin 0 -> 612 bytes .../Rifles/chineserifle.rsi/inhand-right.png | Bin 0 -> 615 bytes .../Guns/Rifles/chineserifle.rsi/mag-0.png | Bin 0 -> 214 bytes .../Guns/Rifles/chineserifle.rsi/meta.json | 33 +++++ .../Weapons/Guns/Rifles/marksman.rsi/base.png | Bin 0 -> 628 bytes .../Rifles/marksman.rsi/equipped-BACKPACK.png | Bin 0 -> 1121 bytes .../Weapons/Guns/Rifles/marksman.rsi/icon.png | Bin 0 -> 659 bytes .../Guns/Rifles/marksman.rsi/inhand-left.png | Bin 0 -> 683 bytes .../Guns/Rifles/marksman.rsi/inhand-right.png | Bin 0 -> 701 bytes .../Guns/Rifles/marksman.rsi/mag-0.png | Bin 0 -> 210 bytes .../Guns/Rifles/marksman.rsi/meta.json | 33 +++++ .../Guns/Rifles/r91.rsi/equipped-BACKPACK.png | Bin 0 -> 1060 bytes .../Guns/Rifles/r91.rsi/inhand-left.png | Bin 393 -> 681 bytes .../Guns/Rifles/r91.rsi/inhand-right.png | Bin 404 -> 660 bytes .../Weapons/Guns/SMGs/10mmPIPE.rsi/base.png | Bin 0 -> 491 bytes .../Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png | Bin 0 -> 547 bytes .../Guns/SMGs/10mmPIPE.rsi/inhand-left.png | Bin 0 -> 580 bytes .../Guns/SMGs/10mmPIPE.rsi/inhand-right.png | Bin 0 -> 566 bytes .../Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png | Bin 0 -> 211 bytes .../Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json | 28 ++++ .../Weapons/Guns/SMGs/12mmPIPE.rsi/base.png | Bin 0 -> 571 bytes .../Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png | Bin 0 -> 622 bytes .../Guns/SMGs/12mmPIPE.rsi/inhand-left.png | Bin 0 -> 725 bytes .../Guns/SMGs/12mmPIPE.rsi/inhand-right.png | Bin 0 -> 737 bytes .../Weapons/Guns/SMGs/12mmPIPE.rsi/mag-0.png | Bin 0 -> 210 bytes .../Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json | 28 ++++ .../Guns/Snipers/antimaterial.rsi/base.png | Bin 0 -> 644 bytes .../Snipers/antimaterial.rsi/inhand-left.png | Bin 0 -> 816 bytes .../Snipers/antimaterial.rsi/inhand-right.png | Bin 0 -> 825 bytes .../Guns/Snipers/antimaterial.rsi/meta.json | 22 +++ 50 files changed, 444 insertions(+) create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimaterial.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimaterial.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimaterial.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimaterial.rsi/meta.json diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index f19c73a915c..c99b2a0e2c6 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -121,3 +121,23 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + +- type: entity + name: 10mm Pipe pistol + parent: BaseWeaponPistol + id: N14WeaponPipe10mm + description: a light 10mm makeshift pistol, the grip is incredibly uncomfortable. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi + - type: Gun + fireRate: 5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 2eb781db2df..e0f7e5340ec 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -43,3 +43,137 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: Chinese Assault Rifle + parent: BaseWeaponRifle + id: N14WeaponChineseRifle + description: A old foreing assault rifle with strange simbols on it, the chamber has enough space to hold a 7,62 bullet. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi + - type: Gun + fireRate: 4 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: Assault Carbine + parent: BaseWeaponRifle + id: N14WeaponCarbine + description: A black compact assault rifle, uses 5.56 ammo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + selectedMode: FullAuto + availableModes: + - FullAuto + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: Marksman Carbine + parent: BaseWeaponRifle + id: N14WeaponMarksman + description: A heavy semiautomatic rifle with a scope, uses 7.62 ammo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg + fireRate: 5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 44a0f70e5df..f399576f853 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -72,3 +72,71 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: 12mm AutoPipe + parent: BaseWeaponSubMachineGun + id: N14weapon12mmpipe + description: a makeshift 12mm SMG, looks like is gonna explode the second it shoots. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi + - type: Gun + fireRate: 4 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnumSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgeMagnum + priority: 1 + whitelist: + tags: + - CartridgeMagnum + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: 10mm AutoPipe + parent: BaseWeaponSubMachineGun + id: N14weapon10mmpipe + description: a makeshift 10mm SMG, if you shake it you could hear the loose parts inside of the gun. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi + - type: Gun + fireRate: 8 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 7229aa2b414..3bf0791f956 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -8,3 +8,20 @@ sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi + +- type: entity + name: Anti-Material rifle + parent: BaseWeaponSniper + id: N14WeaponAntiMaterial + description: A anti material rifle with a ergonomic, metallic skeleton design. only seeing at it you can tell it will rip some limbs apart. Uses .50 anti-material ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Snipers/antimaterial.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Snipers/antimaterial.rsi + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeAntiMaterial + capacity: 5 + proto: CartridgeAntiMaterial diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..e1623ed229b95d305ece76ae1c97315735404a02 GIT binary patch literal 464 zcmV;>0WbcEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0cA-SJ29KqjoeUD5!uieJulo?{74=D9giX|N+V8K$i@5fE z;rsq%0KvvZ{0T?B9={{!AqZec(|9H4ax%$iN)6byodma6Kn4zUoj>{E`TOd2yDX1p zGiG2g9I{%5Kb=-*AkAwWS3d!y>=TeFGN8TBSuNw@ev#8FHGmsOvlM4M+aNQR zWhLYBSU3?xb_|QiHK4d*7!Zab+vT3;F%$UAahzl{8f`67M3cu1B#tpn)#6CT0FD|X ziPJf+lgx_fTW{_Gp4JadfY_|-Ah)`-sOaaRP$(4D0`LU^oVBrL^J_K$0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0h~!hK~z{r?UT)F z!axwmNBa@9#e>oaLP10jDHI_f9=!CDXUOCE9A0|0htN{6PzYiv1d>*y(k6(NG_&26 zjmc_FExqgymYLaPGXKoZfHW=Jlp~kaGKB4C*Qn=OI20k z&&FdSpwVoSScEki?N0#DyXWn{1IV@`V4|1+WicVKh?}Qrtlm}uI5YuPWm3E*!5g0c7J5`TVFA_90&z@`o)6-N>`JDtwzj|YQ6 zhKbR2J?QuQi5)>i*KiYAYFA+KcDoJLY8B98%sNr2RLDD6=(t#fR<{ew@EFuuEmd(O zCIE3=ms~NlJiT5oQp7Y(&@_!k>4*rxR-i2M;d>-8C+ZiMi70zaI7 z6k*#o*~9rDPFh$880#@lI1j=4qK|eWrkF3vUqgvRBKaEtz5p-k%`5mds%-!O002ov JPDHLkV1jma*`ELa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..97259921462b7e435557e276605c1114760f6433 GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4Yr;xjv*CsZ*LiTA9j#9_HlK0NlBruF5^TY z&6I){PcB^Kf3W&s-b?w^QGbu{^^`gJ$9u@9gm;e0pi!_t?(&Q6T4K=cSdTK29_q;kb!L*_O@4lZc zZ5MLmN|O!vA3S{b?8cMRW!67u`t>V%Y>k=6bFlySv(W2TYuBrOW|$X$U;W?lX{nLn zp-#cBk!**SZ?}fU1-8)%MGm zSY2lXTEoCFW3|f9bJGJqKeafw-}}k3?t=&J_8q@CUBU8|*N@PK*8dUfKPwkbmMK-8 z!gYghf6Ur1!qz7P!kq#g%%om=a{s^jdgt_?e?0v2?!?S<|5(0a-|{CLgj$}OL^a6x zv^kf5`ngVge(tr%X**4Pzb5^>`21#cpxgA5)lr!lvI6;>1s;*b3=DjSL74G){)!Z!V4A0kV@QPi+e-&|4=8Z32HesuVOgir^Weg} z2U2Sioe!^7-{{Hz_dQe0k0TyH0@?kEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lP^=K~z{r?Uqf7 z!axv4O9v7WQ86G{3U0(3cmmJhX}yJOcM*aT6+{K?nXl*yF%#30l(_MMbYg42`suXN zmoM6cVQB0nGa8K^?(;P5r~>4h&88tiU>pnv&LC9D$|sYFamgEYRO2sW77m9)I-k$9 zUaw0XKXz0B^6_{~x7&?&yB$SQOK*cQi^am=8pkX~J6)N=3S={vd&zvc zTvET^=T>O&v<1?0$a}pWpY2)s+XDcQw^}XgbUJ*Wm*a`xiyAy#K;%IX(003}cDs$u zW@mNeptJ(B+3Z0sQY|?sTuA!9-|unarI}|prWXGe6FHu5>9qu*nYr-Lg1j6;ydXyq z?;s5Ta*Qau$a%tYzu(i(Xu<(tVPuHxK~brbB(Ybz@Gl$W_#c-oy`6tMTmg}Pf+n&> o-@zw>;0hoJl-?NiJ?4Pu7f%{Arq&-?SO5S307*qoM6N<$f_x6|v;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..5671ea337e9d712027c50fb75038b39ce878b1b3 GIT binary patch literal 866 zcmV-o1D*VdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{2NoK~#8N?V7)9 z6hRcnH;NjOle;dl2x(%W2q{ECBmtWk3yD?Q1hlZSvaztVQ6yFtg4XG*3~2%;BIq9w zBrzZZ-rdf7Z@zElm^YcCD9XRe;J}HNZFb~< zy>?{s^3_(62c-sV9vwYv-<1RpJ2`S{-vj}+79F&n3ILzBKK9vW@^GM{*qpKoV4Gy* zNg)N0Mx&mcKX)OyAe6Bwm`t9`UNT19c(xQRUD(I{S6f-LxnpDw=eM_a%;12{%?~2^ zixkj}@Nk9mV`JmqD}h%4kn@l|UNcWu%sm+Q@WGsUnHz!O`cCJW z4sYJR?pt1d=^X^|$j#rJ_}d9(&yJawG%gefF0LGXE_ra?G=2jcuAlA~FTcWx7h{IubrsrqGcM|scQBjy0K5Mi)^7+xG z^C40#S^!+2(iT#3)U>8HWm&*%Fd%Gf|5DT z4FHL)A_buS)(y9ER28UG9yxr_v~hBzmyLM}2LM~tC_;9^tr=DYD%3}h)l8d}A=t?6 z^dgA&>rt@C@AJ1Sn8t>uQV@WNd-JBxcDD7R^dz_!&ZAG9NC9-7M4bdtrgEz^Rh|$b zZou;gGhiERj4}!0!R?BX^+vri=K)IKpi`f)kww+uAjhN<3r)9`2DVAd@uE2(1wtRp s5CPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0mw;2K~z{r?UqZb z!Y~wukG-HGMMXh6EI29dz!kU#SL-euJ5vyg4-hTX-uoYNO6;wTG$~H}CNX{ZoktR- zFJD{}1VN@gGGQ1#&5L+ybOPkN-L54;U>uD`#vq)c%cCgDO!Af*o$;433n!Ba-EKG9 zY&MmSA2m7w^67L+X_`_T$F$vUjR`ti10vt=_tb8;)m1Z20w~Hamy5b%#(E8u$?x|& zTJY9)TLoY%2en(E%R8M;Ejf7WVcFY24w@uMsNe6i{Cqywk^|!la++PQSDs^ULynST zL;!W=pt1!bU$56K94I1REEahXHu6d!pUq}@=~Xb$&HAo;IkH>U49LV!L zIv$Tta#YDSh{_7g=W~|#dOfUk4h+{ZVqUynhte0N@2As=GlT@_3lrcu8#(y*vdFQ& z^>W*0`iiF(6y*>~xe-JYBj&7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a5cf790041185154f8ef4604cb1ae5ba02572f28 GIT binary patch literal 656 zcmV;B0&o3^P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0wqaAK~#8N?V7(% z!!QuW4Wfu4q6}U5yL9OY41^Z|hCVUy0)!{%KzM=&;quTB(ZIXmhx+W;Jw}bi8uj- zIAOjo?4oGxeL*b(ilQ)wM+fHe;%XWR8u+%b;`3V|6xA~Tb-Ud*>DjrtxxF@WCN#yZ zxET(I(GFHs2S7X`0W~HKnjTOR>YYw!Y7=#+Q|D3J0+=8sE8-EVC{6aPoc1WN<=fUq z)tmn3Pegz^pQ^HczHLp^4f@FHZ*6XvWP9h^eGHKZbNRf5{*hCK=mP)r!Z9Up9CjFZ!2guDH% z&JDDW>IAVuS_u+mi1_^R0k-XLAxRUe5ulYIQ3h<;m3HDa5++m~AXnR1b-Cl$asq6K zQ$JUHCTj#y;a;mvlszhl@Tv(CWr%p7oi!5G0Rkr4H2DF2Uq(;n_3hn0Yo94g143N0 qGU(Iq_a{yI{u%zYctS{IjQId0#WtbV$b3cs0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zFAYK~#8N?V8U{ zgFq0*S7VI_VmP zM4-6mdHR`tzds+1Mw!oV8c`n1W;1PsFbtLN`?=*z^?Ru7$z2~Q; z@^y;=Szy(By&mF0rre1?NHoO+P`=yk>b?mEz`}{V=*Q!+zMmEte{BJYtY~-{lfV$@ zn}8`VsQYi61LsHSf`fEk8RG8gzyzLP3WCZJ86(?L)oS5CkghKqYXcx>C`AYh zW2md^O9jEISRDYPit?ycDEog3@jN<%FJI{dq5lrwD1b$ zzrN`7b5gKe7tDpz2hFTiD3d}45P{GyR(@qMf(@cPki0%t9)>8B!mfm%CoY*Jv>sT3 zIX6|SQ2NBO`g^-O%Gp1#-mg%;6}1XbWH=nIRbRNyJGG=WiV#9tic;S@DlLMepepJB O0000!lvI6;>1s;*b3=DjSL74G){)!Z!V4$aqV@QPi+Y1YM4;b*cT+B{P2uSrQtjh*X^F~?-}QUy>-y09 d{0x)6F#K9A6#m{j{vJ>VgQu&X%Q~loCIBeuKC1u# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json new file mode 100644 index 00000000000..348c10027b5 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..c771e1054b25dc4280c911bf3b785737dbd13059 GIT binary patch literal 690 zcmV;j0!{siP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!K+iK~z{r#g)yA z(@+$}&va@gSWTyX#3}%Voz6|DS?PWZX3sc}*0HMG>cBfG|Z-(ChUU z`?(phCT>8&I-L%5U0>{*%_iFI_J;dfG9s*2t2tbk?Wsf@Jh^vU0L;FP@pvpw8g%m5 z4G=z73%H?7@N-}-Oa!Gpkscu2xUS>ssu%1J2U!{HE))9ExaoI14$z3|y=22Im2 z7z{*AcpO@J3;b}Z+wDd^xztJn%i#6L_ffCcj}4@=DzFC(!*H_MEG)}HCiB-P;SWnX ztkEy*T-e0Rx9?-g!U+-XhC=KGKJFIJ_A1Vc=TBqFz=;wNZkqqT-Q2U@-kP&4oP2SZ zIA(w_-ftPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D187M^K~#8N?V3$! z6G0Tmr{A@bklbpKl0(&?5Q>NuKU(M|wt^@KJ+ywb;73o2c=G7Miz0gR>)^>lPkIt^ z5v)bfgGfLR+Cu0-duvIsjcL=B|750Y+SKgZ>~5#>ez45jA({EVxAU>=8^JIP^S`pI zy~9%Grqru)QwC0+wwyF%3O$F9T6_2Gmzuk~52@N3L1SoC-5Lv=N2voKE4{+>0N9%=5RPxY;7f<_9CBUO#(qy19E zW%-W|1g2z5Q=_aatQ2KQ z#ghQMzCIYpw7`=`pm9C8|4{ZhJ-;g2+Sh_Se^gAd16pCW#amu&h zZwD*>{QQEnbGZf4*%=cbKYei3cTFPz&MPx8=g$w1S+lbl={T;Dk&CikZ-Z1^i?%zT zygLzy^O*B++76z6Z*QNNoO~zmsUyLaaQmDepZFqv&Ha?`2-mJ&k##q3-S9jhiA2J> zbYV=|Po6%Ldp+Lv&^Jm10{9+)iSguyVXuduo|lvt5vL#k`K1+UN23v0+MPuZ?hM4q z+c4?Jdiw!>?)P@!xH3gHo0a9UeY?fW)Kppjcre-gGFg|aMUc{o-2p22Z#tc>(^ohg zmi5^3*1wSkwFtYyO%U{dbQz1qEL^aMlgBMwuxrJ$H^I&DVgzW%GntHh%FT@pD9l9* z2DJu2nPqKm3n1PL(P*QVATkWYFbu;m48t&9fb#;%G!8e~$R9*zW~P;89&WVx{zb@i z$N`|HpM%7WHXZ@0bcBhABQ!c^LDlFu0B)0yL4c$PQs#qQrHm0pD`^CD^(4jDxxBjD zh&^)@6v$JyG?zY;-Cq(Q4 zKlA8KS)b4bjnJy9s^T~RIE{rvNc9b?s-{FF8VNKrixfDh)F-q-qdqz2IVR-is_its zYTOP9N~%WEA_(H~xUoSnSsTMJ48t%C!x)7Se*s=YX?ULlvYh|`002ovPDHLkV1i#~ Bzsdjr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6d3b2197a2371c1c901c7fab7963320036bc29ac GIT binary patch literal 721 zcmV;?0xtcDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%l1>K~z{r#g)&B z(@+$~&rF?|T1->_#4199f>TDQiWFuc+NI!Ld<-AO=kN(!R&XJ7AueX9$_$OjSc=%c zv}ua1{Vq8%%{0?wn#2#nxi`J(@4M%ooKPAnl}dAG`2Q4SV%v$S$ZMilEQ)a|1^|;J ziMrjcJ71U)F>wP7Yq#5^X_`B4G#b=uwYHpP$q2A&wK_*!HHQ*$@a(}o0Wf34tVng~jJA~gWGep93CSFezsmq?c7z%$P{F&1I>k9O~ndO0WN z$|afX>69*R{h@;+b7i(;%K*cnj|WF0nm^lgV(*A?kT$LXE;uiI|NdPu{`BQo#P^@S z268qs;4L_uxgUNOm=*a57S-&&!_X#hC{hLhM@vOlV?Eh3==L>LjB)08^}@oT&>8T; zbGaNXI+}~`(X+75a5PkP_Ne$P~Q1yG;+UkxWDLjkxi_9fZ>C|fM&B9DT+eF;gB+!j0?|Z zvos!$g$XE%kuw*rg7^D<@mr_U5m8lDkr9}H*hp9tYu|z(IG;H{0OEK6XCq;?HUou1 z;S~JU(}&dBR;gC2EfpU(saTFc*LCq{lgWf&0s{Q8p^>z6L3F=2Z{LLmMH0hV$OJBD zN-y@y^Vct*FReMRPSpV5rupyNjXBcnO*Lu)oi7d(O9lYL`_1y3@yeRm^zHkJGmAl- z_HwyA$K}13xcneCk*WdSH7hkZ%WEQaI1Au(;Y5D{lpAF>qr8~~00000NkvXXu0mjf DItfO_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e771f8710914c6983d0345af1b701fa5b601b30c GIT binary patch literal 612 zcmV-q0-ODbP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0r^QpK~#8N?V7z$ z!cY{&pBflUlm!RzV_^{Dq735VsLuYS&g$r59b6^GI_hATVsyY5%&EPk5URBAwpx3B z$;+c3@7{M#--Co+LkJ;+5JCtcq#(3ftsz=?ST3T%|C9-NOlI1Xx6L~j_SQ63*M`fr zCDZHm)M7?~P>DS$I;)(C=ytn9m|*)v;*hx7@#n+d8sGQL#^$;?Iy_dLWHeS5=Bh0n znOv<_Gu^#?bAEAVy)+TC*=!om^Niy-nJjZv10WtN0ez$T9-KeDyh)Yg3RY6QZyYpUyUy1NiEV$?P`7IbD;=@a0u?vTY|IUP2?kP002>Z9Jd-1rZ9esvquK=$aUe(Ee+iGiNRwC908GHS zzRKJL#72(Y&W=F=g`7)MJD~d78T(PIKq3wi?>^ic*L8z)HboPvD?o}EYzrjfK&Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0sKisK~#8N?V7t! z!cZ8+uNoL!Sa1*@gEbN2qAW~~>g-?Ytd1_$!Bt|cn=sg=7#$!6bDDlwYg_vyeVku% zbD^c}Ip^Mn;rkRJgb+dqA%qZ8PP*Oh9K-oqFWkm+4WWn$do|&ET%9Y<913navEJ2a z{2J-^%ff4RI2>lL4-e^VZp{aSLE(0Qm$<7BR-M@w-0`E6cK+qs7J@LXf2Jz`}`M%$?@UK7M)o z;H&-5D**Frji$oD#kdKQ#9Rj4dZAyu$fA1r6@ZurU$d#5ny%}m+4gRr8~Wh`1ck5& z0PoC``C%Iu^Uf({nx^xq9JuvL2pErVpSDlu)DLp741aZL2=!TY^Fpo73w85L2qAD1 zxPPP|EYA?cJbD$feom^&uR92BZ(m*CTxH%v;Mc2=WyL!74)6j&=)y2wo>gySJ+Ka+ z1S!{JxO)|{Bvk++2&>+ljQ?#$h=Z61Qm)6!XI-jKy#s_O%?MFJ@iM4ap-@1mx6%sZ z7>B)sM6GplO_FO1MH(ZeH!sxMyihqqgj5Noz5#&=1?QNwIwt@C002ovPDHLkV1ihV B5{Uo+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..4aab439dba7b1a38c333c54e1c715a2daa637fb3 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V78}=V@QPi+e?OA2NZZ%FWl#IQd|G<$>07* zrgK_!ro}HQ-pV@t|Fi|oKRKOTfZ*SR;&+-$?fQcI0;g}>IdkDww(|Y&y)@U~w{?#_ zwk+qIfT3H9fWhY8^Nbd{&R3%5E8H&lbalUi(k9LVMsHrFM{}iD9tB#<;OXk;vd$@? F2>?3OOSu35 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json new file mode 100644 index 00000000000..348c10027b5 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..92e376ea4b2a300df926b6937b1e7c65fb2c5b13 GIT binary patch literal 628 zcmV-)0*n2LP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0trb(K~z{r#gyBs zfV9S1R;&78Fwimb0}mo?LdZ9pO$yR(w@cgYmTI*chcTwS z5m^8?c{-h@^Z9Jda3^#CDX|ql`R#V2{eJJc|DggvP%f8kAynibZ~zF<(N<1VOilm4lBJ@RLs_6PBYoyWK9d z9QaN~nbCA!^7(v@IoJ~37UQ*0e0&KNz^V|&O@6st=<#^)_uqsF^nx^;oB~uN3OV>O zMo&auEEcI$DzOmVj!{((J~pAq(dB3~P1ERfI`O3{2fhKYdW^&2kmdP&9$juqRpr3* z2Ovk&WwTj29*<~7mIK@`mrG?ic>57qHNc+ZY@^gbLPW80!L|jELsBRd__N3%#05E? zM~N9g1t;t@mm#s>wZ~&)VO72!_{0Bq{3!E#eR4Vj*KKZCcx!-PRkc*_>@0)Vj zhPctta0mhU-_fF0t7UFO+^aX~^?JH&1IFoeYJN@(3Gpv-!CHxAAo>OM!lQ5$J(z$1 O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1NKQoK~#8N?V8VP z6G0Tmr$QjoHfa*nlUn>i!IPI3EA^ltg`?PG03G>woc2Y_<99MozxeiUz|!l(l_Ha5hW9WeTZLV;B( z74c4bj5=U_ecfnyMv=?qSf|qwt@LDW3Yf;I112XYt*-*6G3EeMNy#vsTwb+iJh8j`L!9*>!VPjDL0inrOu*kpnR2 zfBoELc+Eds;l|I-Oa~Z|^XJYc3dOi!Iv^pwd32k%DM`j9wgYe@Bs{!ajXXf&`||bM zNPTm2zrFV9^Zoz;ER*6?n^*?OH?W!T27%<)+S%FbdH?N~7pD`gLW!opQ5g>q`h{YV zCp|gwxk$ptf^w!$oA?7TvZ z*lzZsV6*;R`GXh**P;n@N*p28K^%!&N6;4mxIot0^RNN7L>Uj1s{pijBoP2j9@;#$ zWhP1!PL)|?dZ4%-!Fa%9LE29tM)Db8h0PVeAuk#}` n`K&>81Z0E9P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0w_sDK~z{r#guL9 z!C(}|59P5uOC)(ACGWjZQhW=a)*GKe-b*PFA(rUF7L|%9!Plpij`FtJ#v{tLpVzHoHF2`onEidxS zfEhd#3ej%2Q+Jrlu>mRZv#j8!(}`BA)!Y6%G5|n2oz|If1BYxI000yHEVppTwt;Xs z%yGS56QF?OsJVedwl+!jfS1cVA`F+p^p`?g75{dASKPsVRj{EU={PJz1(O|=_S|C|N zsZ@&3Hu?;SiEodbnRG1x9FRmJ!OsE*5EtNB_fnbxfn&09L1t(Be!uIgR9oPCNhr002ovPDHLkV1iu|De(XR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..58bb4a5fbf3b6c1a097449bcc54acabebc91a2ec GIT binary patch literal 683 zcmV;c0#yBpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zgSbK~#8N?V3SO z!ax{>M-p}taWJ4J1C>vp@}F>$YIY8KiOK!Qlt#AB+K-KEjT`Xg2tn+?qX z15*`W-FE1rCYX3&8(v-0A5aajX%9jZz;HPH)r9aJ6Q4FWVl%1DSp#1*xm>5yakJUX zMNzbMOo+F465*xyj-u>k5D*H?nvnP3Ns+e<^8OP-2qA~bUi~2|IEW-2 RED`_!002ovPDHLkV1oY@9nSy& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..519d097215c54101480c7da003c8dbebc2d0c640 GIT binary patch literal 701 zcmV;u0z&Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0#ZptK~#8N?V3T3 z+CUIRO(b?mNQmVmi;xA&BpXf;as{p$a)FQ&un2PkghYl7VnKMVE>re^)n)>P!eBgb+dqA%v(WgTY`=i?@Y%7yH_R@OHbMbvm7J9fxn`ssY2{Fuc_I zDq-Sbv)SBb!m9=#dbit!{_pxFj#dleqrrB&4JH&J*8mfb!-#+X;VC|;4vWR2OD=1rt{YH3L%6LLI@#*5JCuX4|#=!x|3TR z_4tCxo8?jlP=KVrR)S7JS>Jf54q!o1c_Bl}DxUJ4vc7TC67Y}-el|EfL0|+}#w>a9 zl*o+ySsB1PO+056Qk$G)31GzF!lvI6;>1s;*b3=DjSL74G){)!Z!V7jM^V@QPi+e@~52NXD16K*vgnO(vBzMgyC zL6=8K%op#@U+DRJA8X{3L=~XwhVv&Zx7WoKeXUwD<rwL8JSDvL+nG4A2|jlabi82)v=U}Sl%yydda4qu=l44$rjF6*2UngCQo BOoRXc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json new file mode 100644 index 00000000000..348c10027b5 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..28883c0658832a6aceaea645dadf08e695841f7c GIT binary patch literal 1060 zcmV+<1l#+GP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Gz~=K~#8N?V3Mm z6Hy$;UzJE=)3gZ{L=mD;ErPn(La>V>)H;bv=MD}ox;r_!J9TjA+^v(?MaM$j6r`mU zVjIPZG|g2_Y>21d^S$zV$=$u&{q7|P?*qrZJCeKK?|bjhCEp)2B#^18DVsMVbBymv zpbX55OJkQw??Ea++#vb&jSmC-kc31DfaI^7&e^ricMN-eIufJ;R4NtTijUHnEIXSy z&X1x)DnPkhCheYHoJ{qp0J`|qZ1GlfNCmimaWwW-0Q6-Kpqi9|*s9ifiv}_Q9?e{5 zGdHgCBYGAePTSb{AsJ)>cNckSN?EoL>E?7_n8SXYAa z@o~G+XppTqk$b@Mli9;=8F%tB#bUAdFG6ziv-8W^k}s7?&c0A6*bo96+Rn)?2`zw} z{JrNdwI%PyvMk;TN2tIt=6Ull`O@Tsy}tR84P^(}r>*VS1QByUI-O?u+z@+u`vR-~ z+-I1B!t}zfdjOUq+zeYUp8U6+9cK>_Ao%pN#lsk0%-!mG7<83@d;^^mo(#sjRjd7r z{OIlHXD33fLZRk>UL_CCx2o(~_7B_L-5tQjPiviodkS8;DSvZBeh<*iXzKrizIkq# zM1;f%AVVQS;sh8wHF#tnmBb0K^5q9_G4{O~eH0{e4#2NLSqOu{U@#aA@u0)-|?NQGYn7#va%M;Kjp}Pa3Lq1c3rjIYmfqnLKa$-qT%2u(JBL<7YkR0C?}X01%#h zCr0ukT9-yK(+AztT}R+W+eO-HZETz6hKIG)0SAGVM#Y}Tc<)q4AY1AkfdH}yFd(U% zSe>}zcIPE%8v^dagM23CcyJhdy;$eNf|wDzz@3-C_dP%;2tQ7Yxul4oT1VhH9>f=+ zVzu66Z?Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zOGZK~#8N?V7u8 z8c`622gj8gQeY$#;s%N>9V2DkSaK7mpiSq8@zdlHQp9d7xyeRyX=RbX6{5nDm!yoe z$-nGG>%^D6%n_ITpM)09o-^mn&&(n*BZLq_2qA*=(`gU;QTn8J3ox(ucgHI{kXOB zDz+BEI`Q>Km`6S2Og`^?F_Ww+C`|{#n8>EW8iwbUGcG zPNxzCf%!QVC%*!49+41y{UW`eVc|%?{1>%2aUOP%Rz+>(#Z&+s63#aojYNd*ZIC>z zi->@EnEzpGAU|ezi5<1)0#gC>uo|`>hf+iC<`qGm$9$~2{x+z=4(!3M3rq#j!)9|< zMVPb>1!0YFPH){q$1xA{u`aps8@1~KXAhT$fRot>NrxXDUrU~g073{Mgb+dqA%qY@ z2q6V2Qbcu98e24$4HQeyLw~0))cL$MKnt)})&0yg0 z09&xB&Rg^hmjU3&&pgtD0C z=VQS6vh{zgMXOA6yD6>7q^PduwZ|JKEXamkby|sd{vg`d3l+o1z*_~W_)3gQ}DRD ztGwWig4{vo9hKg%jhBk9nIJCyu{PyI^Pm5}UtW@LNSrZWiSLTLv1`D~Z&rR9g4f=b zPFu#(oGabN7@|E-8qeO|e#C?7uSq1@)MX%>Ol(R3qZ~x2XrmWbl-6*Ocf`&DFX4bayNp00i_>zopr0L9Fe$p8QV diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/inhand-right.png index d5c77a1b8c88e1ee2922db55ed338d5a431bce94..2b25432c9eb18b5d0e29d6cbfb3f9c8ab04af4d8 100644 GIT binary patch literal 660 zcmV;F0&D$=P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0x3yEK~#8N?V7Pp z!cZ86f7DT_i7X;IF?3W(tc!_@I`9ZSj8Ef3sEeaDaqj?5#6fXDR};)Bz2sV;wwGIN z;d}|Xw57M_oZMT6{})0CA%qY@2qC1LTsCER)skU!n2D8WEG;nKbVM3%Bm5qnPEG0n zT-P;9I8T&$aPRlz)XN@1ssLdAWAGUr6^qVb^Z~tK6oOS?zP`OP^gOR{D@v@5+BoA16nt+_L`Piz5Y9&cCNj7e&>S~#XzQvZ#v7y97?er9R^ z5rA$Ud+E9(72o$O{eFKuY0-gB=!I_RhmWKX#sOf@tX78dQa>4+k1mCisY#<#g(a?2 zg#cgh7yma4e~6QMa^aN)B++L)nMGw;d=f$kA%qY@2qA>`R;Sa z`g1Y|0QACXx7!VcWS4US++ynYrH} uv4&qJU<6Cmq#kc_Pa#Wvv@N6TnvXh=y)o12^G<>q^PduwZ|JKEWb9k)LT zRK#5pqF*IyInvf!?NOuypac}%v;@9^DbT&65;zdkJY zV8HngO|D!bOZ)i?7+BXG;t~>W`l=g~$NnMdLz+x~VUxxNwpF)v99#o#l@_g-$lcqu zVK=9GtCY0j`-I1$KT3TzKY6U&!NPOc;EZ(3d>NNte}xy+Khk4M{Ooc)b8DWQ@Fs^< z#mY@qZL#9kfv0P0JAAyvXRN6T&3x}7cBFDIk4xi*lt$mwo&6T!+i&o$5V1b?Bxu)( l%b{J%U*G;IH@W^8^G06j^6-og$AJOB;OXk;vd$@?2>|qvmZ<;$ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..f0b87d12ce8992e8efbc377f5b23626fc9544f38 GIT binary patch literal 491 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0f0$FK~z{r?UTz& z!$1^KT z>t;R}=90<$|2Z><6bgmnztLo$$>nK1l0&+>e=PJ*8hjR?lXw_5@rJWnZ7!b0ZMVBt zFqsAbHV%UyI<8jbN;)t7K9zJ`&WaOhTC#yws}=PhZio%+8HW5qG?@Klnx>o)ja*k4 zs5csNr8rN$-uecX@xxFU&?f`AQjF>TVR{BY-W9MZHeem?(nt7B2S$E>*L$Pu=b_Nv z5vOE;!EtVR9I84at#+XO6nEIp){1veburQ+EhB$~BfG|w3k!=u*5Z54w hTZvwwP$-CqegS2?4xDYk@PPmT002ovPDHLkV1n6j(^voi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d71ced2390fe1a37eabb2c13da58cd999b0c04d5 GIT binary patch literal 547 zcmV+;0^I$HP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0k}y-K~z{r?UP?i z!cZ8--z7A(AiYtDq8mYm5J9lK?OXT}{TAJtH~qOtB0(c4wh&F7wldb9!+B-XZO%X7 z&3{O9=@H3A;v-b0pX2B}ayI^Y|R=pD=hY-Y0M~EaC+h#o|mniu+b; zrNcxT09e=?|IuloAm4=ZW*C%GRrwSjM^SwR7X88E*=#NxBrXeA0CBXLx77f|VFED(4YwAu*(|AU|HF`2 zv<5Q+e0m7O1ZTkuXJDK7GQgrR;Z1)K+scB^K-B4@7>!12oA8|w*C4~l(|h59L^d`l l#l7 zb0j>h4jg!J>iq}yPwX)gGCmPg7?})bNbn>q3RF9??}o7#PiA#|=#$z>%O1Xot$rUH z^G;X^0xoS5z4PBj_|DZST&+JH&9r;dif{k_`Rm@RV||?ecC5O;W?#_popX5FoL7cx zZC>EXdd$a3DOyx0y)mNXmgnjf><#^ApMP!= z_%+vCQ}*rY%MY|lI4bzgFP3*QIL2|zTdT$8AA66Ra_08i&mKKHxaC*5ykf}dr&A{% zxc~OaMgG5re8-}tBUV1W`iZYxdF{PVpYQj2x*))Qy@}1!N;ltB+#%QL{zPWmudK`~ ztSwLXr>A9eJPP7v5I#Qfhkr}M$3WAjB%alA-T(ZqGQ_-QI&|oX;HOVdq@Q2p*1W=W z;N@EHScizRPaKkokDDwevtN}J*siCb6K$EK-oGLCbo!O7{5L;snIcSn6rAffXqxY5 z7v86E=lGX`W3bteCNeGd40HK_x`nH z(mPR?Yg4{V?EnLf=S%h-(=5IH_WjKoJ+{dw?Oy*sYqh*Td)AuH|A%KkTE8mvujf9+ zY^jaB4(|S^o*ojp|N8sW%B7orzBPYcx>fm+OP+A>o|v^qj{jn;C`xvqQ6PQo-asnI=;IZhQ{;xPtlX3;DMV|z1H_*^ULlX^;MG>U-Zxu~mvH7{kx- zJ!nm6&vLr4rpb5azcNFUMu%mbo`*RyUC(OWn6i>FO@i^DfI+5&V(*T~);ls+l{@}v zg%t4B-`@GH@NTt)qT{-B(L;v{BpN$9x|}-X&8{=Zevyhl3yf<9Pgg&ebxsLQ0A&OB AApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..c089ac8249417d700d08c010ade1d14f30fec1ea GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V1}oQV@QPi+Y5$V2NZZ(A70m!J7`?-|L_x@ zn=&zTqJkdXTh`RNFQ1bm>xZL@i_4el+2`H8G~LfhZVmf#Pf=-MxzCSBYgEhTpKjrv zAt|~{Bx9}O(h}V#?%VfjCAhJM#)d2WvJ|XkC}46vthasld(}LkoeZ9?elF{r5}E+< C8%SIL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json new file mode 100644 index 00000000000..20b14181c14 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified desertrose at https://github.com/DesertRose2/desertrose/pull/1282/commits/10ee00646d92bd9f3197a98f374e29f06686245d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..aef74dc8b2a06bbec2d04a3c0720732c8f03e81d GIT binary patch literal 571 zcmV-B0>u4^P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0nkZAK~z{r?UTW3 z!axv)C-opIRfAQb;6V_A6iQFx!AqeJ;UoGM?NM@RDYe)tDD&M>vexgC_YWNDum+mT+P~tEB ze&|LH8UT2CX0NGKEQ%d9U*j>Yw1f4xcDE6MN%i|44m%|CXn4O!fq1m{>w1Ny9cg;W0DR5 z4d}@!1i=Q-Ek=dT&+Q%@)67|gRO}w-a~nDdn7}2%h=>RUM89BqBS;hf*sA~l002ov JPDHLkV1nkC^)&zh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dbf673182025ede1fcd0a287aef0fe2bcc5c9000 GIT binary patch literal 622 zcmV-!0+IcRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0s~1zK~z{r?UP+g z0znjp&sGpBS&Nwv1PQ`YQ3R=Y5kb&Zzrdg9zo<)DjiN955EQymOpJw;K(T#KGt0W} zmjzwz1H;ZaJLjEqX3kJVL`1}YaeAOlFobELh_5I1po`n*ne}d>emFH;1?8f{TrQOO zO`{RIkiY~07WW5Z+R9{v$D6lKhek@^{!`q)zFGk@k>zrE(s{flnLr{I6Mu*rA0MP? zny`qBR*MtRc6R8Y*`&Q}R{SAP`{C({)>V~#m%6Sj@GK;`wKW=>8_FRu41=~(DgI(3 zKN}Bjo1#$ORMGG1Eo@lyR}-aDrd*Xld;jI#blcQy|>$(fE^^@_6np9fL5qifS_Wr z$a7uSDK_YH02;GWsVH90QjIT)*$>0GO3-PV_Yb<=uBF8e8&(s_%@HI6odKwH$!tV* zJ3}Yu=Y%5_hA<-{B0M1a2E$@FXn&5?CjbBd07*qo IM6N<$f+*1p^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a1ea25624f95fd47f2a1ddb643dc736415a1ef0a GIT binary patch literal 725 zcmV;`0xJE9P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%}P_K~#8N?V7<$ z8$lSw$Mz6J2!<3~gn)uzr8yLo1{#G5xk=9EugKq(d+9A;L3>C~y%bvz6ao?tAtH$M z(2o1o`J@KZn%%ddh4+K7yP2Ig-}h#A6PV8lA%qY@2qAy8D*L>$Nria%Cks?{vGgxM?%CFhB1qOG^m!XZVWFx3jZw#)IZ$tI_Z{ z`q+r?$H!O+6m85rOY1Rc!Uz;cEK`^;9F1J}=qQtZV|&||OC>jVb3OT3t+p`Dir6vhL?ELN*kzu#>7X$?Rh^c`P4 zc_dGJ1mYRGe@V4kEnnT*a>YWy_0P{;saOmxe+T!X5Bfp_TA}H|7%b?52spxfU@&l< zPA8K-Q)?2m6<}Ns`m}(d0WD|>A%qY@2qAntC^iy5EN95lhl) z1Z-e2%=hLu#{m+Mo$u)`|J{%mR9t#FkmX{wSADWWnvlLFy4alRYVQ+WW zkFKtg^EW#?RBgHe_&HjLD!Em3%%W=Kp9dzS`O_nW7{j?+9+Oy#7(PkS00000NkvXX Hu0mjfs|Gj> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c5fd34df702bf7961bb984645facf21ea371c5ec GIT binary patch literal 737 zcmV<70v`Q|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0(MD6K~#8N?V3+Z z0znwY#|T6MQ4I1D6bL1G2#SPCDDW1Z^Hcb_yhk^|pbQLzE$^KoT7R8cWqu)%kXOPD%==+%0Q%<5wR}D@=If0{43nj1ANs8u zV{lz2<^6p#lTM4+`}-iOUYAuEz;-bE6W8taMC0PZRrkmh0Q1Jni`5wBtLHH4X-L0*G`J4NDkxiwn z<-@B?4)=fu?%8fUSO3`5lG^~k&c6<+nb{tiGR zG=4K4<&|gw-BF!9LI@#*5JCtcgb+dqvE%wj?#z)%h*=8KK31R(Ke}C{puhSbXA%TC zmR5WVuN>?RvPJ7FD+2Wc(-7uF)hg)5cK}Y#S}}VNP(L7pFqC)G1@e0s17qnPCs5Wz ziNQ+nQj9PODqW9E@3Uc8wF)}(l!5jxiY6e)YcYaflzC^Zf=&Vj0N(--rt? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..806c602d31b9f1766bb70eb173d392da094dc5a4 GIT binary patch literal 210 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 Date: Wed, 21 Jun 2023 19:17:25 +0100 Subject: [PATCH 02/43] Update snipers.yml fixed rsi path --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 3bf0791f956..0564b1c0ec7 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -16,9 +16,9 @@ description: A anti material rifle with a ergonomic, metallic skeleton design. only seeing at it you can tell it will rip some limbs apart. Uses .50 anti-material ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Snipers/antimaterial.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/antimaterial.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Snipers/antimaterial.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/antimaterial.rsi - type: BallisticAmmoProvider whitelist: tags: From ebe759b1a5827d653619c84d98d3a9bd1db2bac9 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Mon, 21 Aug 2023 19:42:41 -0300 Subject: [PATCH 03/43] Ammunition calibers added 11 ammunition calibers, 12 magazines and 2 new guns --- .../Weapons/Guns/Ammunition/Boxes/10mm.yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/12.7.yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/12gauge.yml | 37 ++++++++ .../Weapons/Guns/Ammunition/Boxes/20gauge.yml | 37 ++++++++ .../Weapons/Guns/Ammunition/Boxes/22lr.yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/308.yml | 40 +++++++++ .../Weapons/Guns/Ammunition/Boxes/44.yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/45..yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/5.56.yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/50.yml | 1 + .../Weapons/Guns/Ammunition/Boxes/7.62.yml | 39 ++++++++ .../Weapons/Guns/Ammunition/Boxes/9mm.yml | 39 ++++++++ .../Guns/Ammunition/Cartridges/10mm.yml | 7 ++ .../Guns/Ammunition/Cartridges/12.7.yml | 7 ++ .../Guns/Ammunition/Cartridges/12gauge.yml | 35 ++++++++ .../Guns/Ammunition/Cartridges/20gauge.yml | 35 ++++++++ .../Guns/Ammunition/Cartridges/22lr.yml | 7 ++ .../Guns/Ammunition/Cartridges/308.yml | 7 ++ .../Weapons/Guns/Ammunition/Cartridges/44.yml | 7 ++ .../Guns/Ammunition/Cartridges/45..yml | 7 ++ .../Guns/Ammunition/Cartridges/5.56.yml | 7 ++ .../Weapons/Guns/Ammunition/Cartridges/50.yml | 20 +++++ .../Guns/Ammunition/Cartridges/7.62.yml | 7 ++ .../Guns/Ammunition/Cartridges/9mm.yml | 7 ++ .../Guns/Ammunition/Magazines/10mm.yml | 83 ++++++++++++++++++ .../Guns/Ammunition/Magazines/12.7.yml | 83 ++++++++++++++++++ .../Guns/Ammunition/Magazines/12gauge.yml | 52 +++++++++++ .../Guns/Ammunition/Magazines/20gauge.yml | 50 +++++++++++ .../Guns/Ammunition/Magazines/22lr.yml | 42 +++++++++ .../Weapons/Guns/Ammunition/Magazines/45..yml | 75 ++++++++++++++++ .../Guns/Ammunition/Magazines/5.56.yml | 54 ++++++++++++ .../Guns/Ammunition/Magazines/7.62.yml | 42 +++++++++ .../Weapons/Guns/Ammunition/Magazines/9mm.yml | 43 +++++++++ .../Guns/Ammunition/Projectiles/10mm.yml | 10 +++ .../Guns/Ammunition/Projectiles/12.7.yml | 10 +++ .../Guns/Ammunition/Projectiles/12gauge.yml | 13 +++ .../Guns/Ammunition/Projectiles/20gauge.yml | 13 +++ .../Guns/Ammunition/Projectiles/22lr.yml | 10 +++ .../Guns/Ammunition/Projectiles/308.yml | 10 +++ .../Guns/Ammunition/Projectiles/44.yml | 10 +++ .../Guns/Ammunition/Projectiles/45..yml | 10 +++ .../Guns/Ammunition/Projectiles/5.56.yml | 10 +++ .../Guns/Ammunition/Projectiles/50.yml | 10 +++ .../Guns/Ammunition/Projectiles/7.62.yml | 10 +++ .../Guns/Ammunition/Projectiles/9mm.yml | 10 +++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 63 +++++++++++-- .../Weapons/Guns/Revolvers/revolvers.yml | 19 +++- .../Objects/Weapons/Guns/Rifles/rifles.yml | 78 ++++++++++++---- .../Objects/Weapons/Guns/SMGs/smgs.yml | 46 ++++++++-- .../Weapons/Guns/Shotguns/shotguns.yml | 77 ++++++++++++++-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 33 +++++-- .../Guns/Ammunition/Boxes/10mm.rsi/base.png | Bin 0 -> 510 bytes .../Guns/Ammunition/Boxes/10mm.rsi/mag-1.png | Bin 0 -> 216 bytes .../Guns/Ammunition/Boxes/10mm.rsi/meta.json | 17 ++++ .../Guns/Ammunition/Boxes/12-7mm.rsi/base.png | Bin 0 -> 646 bytes .../Ammunition/Boxes/12-7mm.rsi/mag-1.png | Bin 0 -> 251 bytes .../Ammunition/Boxes/12-7mm.rsi/meta.json | 17 ++++ .../Ammunition/Boxes/12-gauge.rsi/base.png | Bin 0 -> 513 bytes .../Ammunition/Boxes/12-gauge.rsi/meta.json | 14 +++ .../Ammunition/Boxes/20-gauge.rsi/base.png | Bin 0 -> 485 bytes .../Ammunition/Boxes/20-gauge.rsi/meta.json | 14 +++ .../Guns/Ammunition/Boxes/22lr.rsi/base.png | Bin 0 -> 506 bytes .../Guns/Ammunition/Boxes/22lr.rsi/mag-1.png | Bin 0 -> 216 bytes .../Guns/Ammunition/Boxes/22lr.rsi/meta.json | 17 ++++ .../Guns/Ammunition/Boxes/308.rsi/base.png | Bin 0 -> 526 bytes .../Guns/Ammunition/Boxes/308.rsi/mag-1.png | Bin 0 -> 216 bytes .../Guns/Ammunition/Boxes/308.rsi/meta.json | 17 ++++ .../Guns/Ammunition/Boxes/44.rsi/base.png | Bin 0 -> 487 bytes .../Guns/Ammunition/Boxes/44.rsi/mag-1.png | Bin 0 -> 216 bytes .../Guns/Ammunition/Boxes/44.rsi/meta.json | 17 ++++ .../Ammunition/Boxes/45-auto.rsi/base.png | Bin 0 -> 623 bytes .../Ammunition/Boxes/45-auto.rsi/mag-1.png | Bin 0 -> 251 bytes .../Ammunition/Boxes/45-auto.rsi/meta.json | 17 ++++ .../Guns/Ammunition/Boxes/5-56.rsi/base.png | Bin 0 -> 493 bytes .../Guns/Ammunition/Boxes/5-56.rsi/mag-1.png | Bin 0 -> 216 bytes .../Guns/Ammunition/Boxes/5-56.rsi/meta.json | 17 ++++ .../Boxes/50anti-material.rsi/base.png | Bin 0 -> 457 bytes .../Boxes/50anti-material.rsi/meta.json | 14 +++ .../Guns/Ammunition/Boxes/7-62.rsi/base.png | Bin 0 -> 483 bytes .../Guns/Ammunition/Boxes/7-62.rsi/mag-1.png | Bin 0 -> 216 bytes .../Guns/Ammunition/Boxes/7-62.rsi/meta.json | 17 ++++ .../Guns/Ammunition/Boxes/9mm.rsi/base.png | Bin 0 -> 533 bytes .../Guns/Ammunition/Boxes/9mm.rsi/mag-1.png | Bin 0 -> 251 bytes .../Guns/Ammunition/Boxes/9mm.rsi/meta.json | 17 ++++ .../Magazines/10mm/pistolmag.rsi/base.png | Bin 0 -> 332 bytes .../Magazines/10mm/pistolmag.rsi/mag-1.png | Bin 0 -> 192 bytes .../Magazines/10mm/pistolmag.rsi/mag-2.png | Bin 0 -> 209 bytes .../Magazines/10mm/pistolmag.rsi/mag-3.png | Bin 0 -> 229 bytes .../Magazines/10mm/pistolmag.rsi/mag-4.png | Bin 0 -> 248 bytes .../Magazines/10mm/pistolmag.rsi/meta.json | 27 ++++++ .../Magazines/10mm/smgmag.rsi/base.png | Bin 0 -> 362 bytes .../Magazines/10mm/smgmag.rsi/mag-1.png | Bin 0 -> 191 bytes .../Magazines/10mm/smgmag.rsi/mag-2.png | Bin 0 -> 191 bytes .../Magazines/10mm/smgmag.rsi/mag-3.png | Bin 0 -> 191 bytes .../Magazines/10mm/smgmag.rsi/mag-4.png | Bin 0 -> 191 bytes .../Magazines/10mm/smgmag.rsi/meta.json | 27 ++++++ .../Magazines/12.7/pistolmag.rsi/base.png | Bin 0 -> 355 bytes .../Magazines/12.7/pistolmag.rsi/mag-1.png | Bin 0 -> 193 bytes .../Magazines/12.7/pistolmag.rsi/mag-2.png | Bin 0 -> 223 bytes .../Magazines/12.7/pistolmag.rsi/mag-3.png | Bin 0 -> 256 bytes .../Magazines/12.7/pistolmag.rsi/mag-4.png | Bin 0 -> 253 bytes .../Magazines/12.7/pistolmag.rsi/meta.json | 27 ++++++ .../Magazines/12.7/smgmag.rsi/base.png | Bin 0 -> 290 bytes .../Magazines/12.7/smgmag.rsi/mag-1.png | Bin 0 -> 183 bytes .../Magazines/12.7/smgmag.rsi/mag-2.png | Bin 0 -> 183 bytes .../Magazines/12.7/smgmag.rsi/mag-3.png | Bin 0 -> 183 bytes .../Magazines/12.7/smgmag.rsi/mag-4.png | Bin 0 -> 183 bytes .../Magazines/12.7/smgmag.rsi/meta.json | 27 ++++++ .../Magazines/12gauge/mag.rsi/base.png | Bin 0 -> 453 bytes .../Magazines/12gauge/mag.rsi/mag-1.png | Bin 0 -> 160 bytes .../Magazines/12gauge/mag.rsi/meta.json | 17 ++++ .../Magazines/20gauge/mag.rsi/base.png | Bin 0 -> 391 bytes .../Magazines/20gauge/mag.rsi/mag-1.png | Bin 0 -> 162 bytes .../Magazines/20gauge/mag.rsi/meta.json | 17 ++++ .../Magazines/22lr/pistolmag.rsi/base.png | Bin 0 -> 337 bytes .../Magazines/22lr/pistolmag.rsi/mag-1.png | Bin 0 -> 192 bytes .../Magazines/22lr/pistolmag.rsi/mag-2.png | Bin 0 -> 208 bytes .../Magazines/22lr/pistolmag.rsi/mag-3.png | Bin 0 -> 230 bytes .../Magazines/22lr/pistolmag.rsi/mag-4.png | Bin 0 -> 247 bytes .../Magazines/22lr/pistolmag.rsi/meta.json | 27 ++++++ .../Magazines/22lr/smgmag.rsi/base.png | Bin 0 -> 376 bytes .../Magazines/22lr/smgmag.rsi/meta.json | 14 +++ .../Magazines/45/pistolmag.rsi/base.png | Bin 0 -> 327 bytes .../Magazines/45/pistolmag.rsi/mag-1.png | Bin 0 -> 196 bytes .../Magazines/45/pistolmag.rsi/mag-2.png | Bin 0 -> 205 bytes .../Magazines/45/pistolmag.rsi/mag-3.png | Bin 0 -> 208 bytes .../Magazines/45/pistolmag.rsi/mag-4.png | Bin 0 -> 210 bytes .../Magazines/45/pistolmag.rsi/meta.json | 27 ++++++ .../Magazines/45/smgmag.rsi/base.png | Bin 0 -> 299 bytes .../Magazines/45/smgmag.rsi/mag-1.png | Bin 0 -> 191 bytes .../Magazines/45/smgmag.rsi/meta.json | 17 ++++ .../Magazines/5.56/mag.rsi/base.png | Bin 0 -> 286 bytes .../Magazines/5.56/mag.rsi/mag-1.png | Bin 0 -> 194 bytes .../Magazines/5.56/mag.rsi/meta.json | 17 ++++ .../Magazines/5.56/mag2.rsi/base.png | Bin 0 -> 390 bytes .../Magazines/5.56/mag2.rsi/mag-1.png | Bin 0 -> 196 bytes .../Magazines/5.56/mag2.rsi/meta.json | 17 ++++ .../Magazines/7.62/mag.rsi/base.png | Bin 0 -> 348 bytes .../Magazines/7.62/mag.rsi/mag-1.png | Bin 0 -> 196 bytes .../Magazines/7.62/mag.rsi/meta.json | 17 ++++ .../Magazines/9mm/pistolmag.rsi/base.png | Bin 0 -> 351 bytes .../Magazines/9mm/pistolmag.rsi/mag-1.png | Bin 0 -> 193 bytes .../Magazines/9mm/pistolmag.rsi/mag-2.png | Bin 0 -> 211 bytes .../Magazines/9mm/pistolmag.rsi/mag-3.png | Bin 0 -> 228 bytes .../Magazines/9mm/pistolmag.rsi/mag-4.png | Bin 0 -> 240 bytes .../Magazines/9mm/pistolmag.rsi/meta.json | 27 ++++++ .../Magazines/9mm/smgmag.rsi/base.png | Bin 0 -> 262 bytes .../Guns/Rifles/assaultcarbine.rsi/base.png | Bin 550 -> 593 bytes .../Guns/Rifles/assaultcarbine.rsi/icon.png | Bin 563 -> 642 bytes .../Guns/Rifles/assaultcarbine.rsi/mag-0.png | Bin 188 -> 214 bytes .../Guns/Rifles/chineserifle.rsi/base.png | Bin 690 -> 695 bytes .../Guns/Rifles/chineserifle.rsi/icon.png | Bin 721 -> 728 bytes .../Weapons/Guns/Rifles/marksman.rsi/icon.png | Bin 659 -> 676 bytes .../Rifles/servicerifle.rsi/.308 box open.png | Bin 0 -> 563 bytes .../Guns/Rifles/servicerifle.rsi/Mag-0.png | Bin 0 -> 189 bytes .../Guns/Rifles/servicerifle.rsi/base.png | Bin 0 -> 612 bytes .../servicerifle.rsi/equipped-BACKPACK.png | Bin 0 -> 1104 bytes .../Guns/Rifles/servicerifle.rsi/icon.png | Bin 0 -> 621 bytes .../Rifles/servicerifle.rsi/inhand-left.png | Bin 0 -> 681 bytes .../Rifles/servicerifle.rsi/inhand-right.png | Bin 0 -> 694 bytes .../Guns/Rifles/servicerifle.rsi/meta.json | 33 +++++++ .../Guns/Shotguns/riot_shotgun.rsi/base.png | Bin 0 -> 565 bytes .../Guns/Shotguns/riot_shotgun.rsi/icon.png | Bin 0 -> 623 bytes .../Shotguns/riot_shotgun.rsi/inhand-left.png | Bin 0 -> 589 bytes .../riot_shotgun.rsi/inhand-right.png | Bin 0 -> 612 bytes .../Guns/Shotguns/riot_shotgun.rsi/mag-0.png | Bin 0 -> 244 bytes .../Guns/Shotguns/riot_shotgun.rsi/meta.json | 28 ++++++ .../Guns/Snipers/piperifle.rsi/base.png | Bin 0 -> 484 bytes .../Snipers/piperifle.rsi/inhand-left.png | Bin 0 -> 623 bytes .../Snipers/piperifle.rsi/inhand-right.png | Bin 0 -> 631 bytes .../Guns/Snipers/piperifle.rsi/meta.json | 22 +++++ 171 files changed, 2080 insertions(+), 49 deletions(-) create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/20gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/10mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/20gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/22lr.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45..yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/9mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10mm.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12.7.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/20gauge.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/22lr.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45..yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/5.56.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/7.62.yml create mode 100644 Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/9mm.yml create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/50anti-material.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/50anti-material.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12gauge/mag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12gauge/mag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12gauge/mag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/20gauge/mag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/20gauge/mag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/20gauge/mag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/smgmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/smgmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-1.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-2.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-3.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-4.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/smgmag.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/.308 box open.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/Mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/mag-0.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml new file mode 100644 index 00000000000..f6f1dd8972c --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox10mm + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol10 + proto: N14CartridgePistol10 + capacity: 80 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\10mm.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox10mm + id: MagazineBox10mm + name: ammunition box (10mm) + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol10 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml new file mode 100644 index 00000000000..2e2ab857a81 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox12 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol12.7 + proto: N14CartridgePistol12.7 + capacity: 75 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\12-7mm.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox12 + id: MagazineBox12 + name: ammunition box (12.7mm) + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol12.7 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml new file mode 100644 index 00000000000..fbc9769768b --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml @@ -0,0 +1,37 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox12gauge + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14ShellShotgun12 + proto: N14ShellShotgun12 + capacity: 30 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\12-gauge.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox12gauge + id: MagazineBox12gauge + name: ammunition box (12 gauge) + components: + - type: BallisticAmmoProvider + proto: N14ShellShotgun12 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml new file mode 100644 index 00000000000..6c1284457b7 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml @@ -0,0 +1,37 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox20gauge + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14ShellShotgun20 + proto: N14ShellShotgun20 + capacity: 30 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\20-gauge.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox20gauge + id: MagazineBox20gauge + name: ammunition box (20 gauge) + components: + - type: BallisticAmmoProvider + proto: N14ShellShotgun20 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml new file mode 100644 index 00000000000..bb73ac264e9 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox22 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol22 + proto: N14CartridgePistol22 + capacity: 75 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\22lr.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox22 + id: MagazineBox22 + name: ammunition box (22lr) + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol22 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml new file mode 100644 index 00000000000..0e616ca52ae --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml @@ -0,0 +1,40 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox308 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge308Rifle + proto: N14Cartridge308Rifle + capacity: 32 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\308.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox308 + id: MagazineBox308 + name: ammunition box (.308) + components: + - type: BallisticAmmoProvider + proto: N14Cartridge308Rifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml new file mode 100644 index 00000000000..82f9d61e00e --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox44 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge44Magnum + proto: N14Cartridge44Magnum + capacity: 32 + - type: Item + size: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\44.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox44 + id: MagazineBox44 + name: ammunition box (.44) + components: + - type: BallisticAmmoProvider + proto: N14Cartridge44Magnum + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml new file mode 100644 index 00000000000..a1e52fe728a --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox45 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol45 + proto: N14CartridgePistol45 + capacity: 75 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\45-auto.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox45 + id: MagazineBox45 + name: ammunition box (45 auto) + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol45 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml new file mode 100644 index 00000000000..a1e36c8f0ec --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox5.56Rifle + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge5.56Rifle + proto: N14Cartridge5.56Rifle + capacity: 75 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\5-56.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox5.56Rifle + id: MagazineBox5.56 + name: ammunition box (5.56mm) + components: + - type: BallisticAmmoProvider + proto: N14Cartridge5.56Rifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml @@ -0,0 +1 @@ + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml new file mode 100644 index 00000000000..d9c247b328e --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox7.62Rifle + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge7.62Rifle + proto: N14Cartridge7.62ifle + capacity: 60 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\7-62.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox7.62Rifle + id: MagazineBox7.62 + name: ammunition box (7.62mm) + components: + - type: BallisticAmmoProvider + proto: N14Cartridge7.62Rifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml new file mode 100644 index 00000000000..cc175ad01fa --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml @@ -0,0 +1,39 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox9mm + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol9 + proto: NN14CartridgePistol9 + capacity: 80 + - type: Item + size: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\9mm.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox9mm + id: MagazineBox9mm + name: ammunition box (9mm) + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol9 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml new file mode 100644 index 00000000000..2f7d1072f7f --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14CartridgePistol10 + name: cartridge (10mm) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: N14Bullet10mm diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml new file mode 100644 index 00000000000..cfb27a2c78c --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14CartridgePistol12.7 + name: cartridge (12.7mm) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: N14Bullet12.7 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12gauge.yml new file mode 100644 index 00000000000..942ba8d669d --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12gauge.yml @@ -0,0 +1,35 @@ +- type: entity + id: N14BaseShell12Shotgun + name: shell (12 gauge) + parent: BaseCartridge + abstract: true + components: + - type: Tag + tags: + - Cartridge + - ShellShotgun + - type: CartridgeAmmo + count: 6 + spread: 15 + soundEject: + collection: ShellEject + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - type: Appearance + - type: SpentAmmoVisuals + +- type: entity + id: N14ShellShotgun12 + name: shell (12 gauge) + parent: N14BaseShell12Shotgun + components: + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - type: CartridgeAmmo + proto: PelletShotgun12 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/20gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/20gauge.yml new file mode 100644 index 00000000000..a0057f6654d --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/20gauge.yml @@ -0,0 +1,35 @@ +- type: entity + id: N14BaseShell20Shotgun + name: shell (20 gauge) + parent: BaseCartridge + abstract: true + components: + - type: Tag + tags: + - Cartridge + - ShellShotgun + - type: CartridgeAmmo + count: 6 + spread: 15 + soundEject: + collection: ShellEject + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - type: Appearance + - type: SpentAmmoVisuals + +- type: entity + id: N14ShellShotgun20 + name: shell (20 gauge) + parent: N14BaseShell20Shotgun + components: + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - type: CartridgeAmmo + proto: PelletShotgun20 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml new file mode 100644 index 00000000000..ab1ca01ba94 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14CartridgePistol22 + name: cartridge (.22lr) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: N14Bullet22 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml new file mode 100644 index 00000000000..7c5de92b2a9 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14Cartridge308Rifle + name: cartridge (.308) + parent: BaseCartridgeLightRifle + components: + - type: CartridgeAmmo + proto: N14Bullet308 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml new file mode 100644 index 00000000000..2502c13caf6 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14Cartridge44Magnum + name: cartridge (.44 magnum) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: N14Bullet44 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml new file mode 100644 index 00000000000..9d80af8fc7c --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml @@ -0,0 +1,7 @@ +- type: entity + id: N14CartridgePistol45 + name: cartridge (.45 auto) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: N14Bullet.45 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml new file mode 100644 index 00000000000..479c7366a34 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14Cartridge5.56Rifle + name: cartridge (5.56mm) + parent: BaseCartridgeLightRifle + components: + - type: CartridgeAmmo + proto: N14Bullet5.56 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml new file mode 100644 index 00000000000..ce90efd7d0d --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml @@ -0,0 +1,20 @@ +- type: entity + parent: BaseCartridge + id: N14Cartridge.50 + name: cartridge (.50 anti-materiel) + components: + - type: Tag + tags: + - Cartridge + - CartridgeAntiMateriel + - type: CartridgeAmmo + proto: N14Bullet50 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + - type: StaticPrice + price: 20 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml new file mode 100644 index 00000000000..9658b182c96 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14Cartridge7.62Rifle + name: cartridge (7.62mm) + parent: BaseCartridgeLightRifle + components: + - type: CartridgeAmmo + proto: N14Bullet7.62 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml new file mode 100644 index 00000000000..a81bb352e44 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml @@ -0,0 +1,7 @@ +- type: entity + id: N14CartridgePistol9 + name: cartridge (9mm) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: N14Bullet9mm diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/10mm.yml new file mode 100644 index 00000000000..25b0b1b8fea --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/10mm.yml @@ -0,0 +1,83 @@ +- type: entity + id: N14BaseMagazine10mmPistol + name: pistol magazine (10mm) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol10 + capacity: 10 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazinePistol10mm + name: pistol magazine (10mm) + parent: N14BaseMagazine10mmPistol + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol10 + +- type: entity + id: N14BaseMagazine10mmSubMachineGun + name: SMG magazine (10mm) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol10 + capacity: 35 + - type: Item + size: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazineSMG10mm + name: SMG magazine (10mm) + parent: N14BaseMagazine10mmSubMachineGun + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol10 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml new file mode 100644 index 00000000000..accdf007327 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12.7.yml @@ -0,0 +1,83 @@ +- type: entity + id: N14BaseMagazine12.7Pistol + name: pistol magazine (12.7mm) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol12.7 + capacity: 10 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazinePistol12mm + name: pistol magazine (12.7mm) + parent: N14BaseMagazine12.7Pistol + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol12.7 + +- type: entity + id: N14BaseMagazine12.7SubMachineGun + name: SMG magazine (12.7mm) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol12.7 + capacity: 28 + - type: Item + size: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazineSMG12mm + name: SMG magazine (12.7mm) + parent: N14BaseMagazine12.7SubMachineGun + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol12.7 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12gauge.yml new file mode 100644 index 00000000000..929942591f7 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/12gauge.yml @@ -0,0 +1,52 @@ +- type: entity + id: N14BaseMagazineShotgun12 + name: ammo drum (12 gauge shells) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineShotgun + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14ShellShotgun12 + capacity: 8 + soundRack: + path: /Audio/Weapons/Guns/Cock/smg_cock.ogg + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12gauge/mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazineShotgun12 + name: ammo drum (12 gauge shells) + parent: N14BaseMagazineShotgun12 + components: + - type: BallisticAmmoProvider + proto: N14ShellShotgun12 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + + + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/20gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/20gauge.yml new file mode 100644 index 00000000000..0fe61021394 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/20gauge.yml @@ -0,0 +1,50 @@ +- type: entity + id: N14BaseMagazineShotgun20 + name: ammo drum (20 gauge shells) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineShotgun + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14ShellShotgun20 + capacity: 10 + soundRack: + path: /Audio/Weapons/Guns/Cock/smg_cock.ogg + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/20gauge/mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazineShotgun20 + name: ammo drum (20 gauge shells) + parent: N14BaseMagazineShotgun20 + components: + - type: BallisticAmmoProvider + proto: N14ShellShotgun20 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/22lr.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/22lr.yml new file mode 100644 index 00000000000..341b07e7a3e --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/22lr.yml @@ -0,0 +1,42 @@ +- type: entity + id: N14BaseMagazine22Pistol + name: pistol magazine (.22lr) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol22 + capacity: 18 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazinePistol22lr + name: pistol magazine (.22lr) + parent: N14BaseMagazine22Pistol + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol22 + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45..yml new file mode 100644 index 00000000000..a169ae98b89 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45..yml @@ -0,0 +1,75 @@ +- type: entity + id: N14BaseMagazine45Pistol + name: pistol magazine (45. auto) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol45 + capacity: 8 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazinePistol45 + name: pistol magazine (45. auto) + parent: N14BaseMagazine45Pistol + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol45 + +- type: entity + id: BaseMagazine45SubMachineGun + name: SMG magazine (45. auto) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - Magazine45SubMachineGun + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol45 + capacity: 25 + - type: Item + size: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml new file mode 100644 index 00000000000..96f6c5d9eb0 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml @@ -0,0 +1,54 @@ +- type: entity + id: BaseMagazine5.56Rifle + name: "magazine (5.56mm)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineLightRifle + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge5.56Rifle + proto: N14Cartridge5.56Rifle + capacity: 25 + - type: Item + size: 10 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Magazines\5.56\mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: Magazine5.56Rifle + name: "magazine (5.56mm)" + parent: BaseMagazine5.56Rifle + components: + - type: BallisticAmmoProvider + proto: N14Cartridge5.56Rifle + +- type: entity + id: LongMagazine5.56Rifle + name: "carbine magazine (5.56mm)" + parent: BaseMagazine5.56Rifle + components: + - type: BallisticAmmoProvider + proto: N14Cartridge5.56Rifle + capacity: 35 + - type: Sprite + netsync: false + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Magazines\5.56\mag2.rsi diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml new file mode 100644 index 00000000000..7c2f82b29ef --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml @@ -0,0 +1,42 @@ +- type: entity + id: BaseMagazine7.62Rifle + name: "magazine (7.62mm)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineLightRifle + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge7.62Rifle + proto: N14Cartridge7.62Rifle + capacity: 30 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Magazines\7.62\mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: Magazine7.62Rifle + name: "magazine (7.62mm)" + parent: BaseMagazine7.62Rifle + components: + - type: BallisticAmmoProvider + proto: N14Cartridge7.62Rifle diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/9mm.yml new file mode 100644 index 00000000000..8a633fbab28 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/9mm.yml @@ -0,0 +1,43 @@ +- type: entity + id: N14BaseMagazine9mmPistol + name: pistol magazine (9mm) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14CartridgePistol9 + capacity: 14 + - type: Item + size: 5 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + netsync: false + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +- type: entity + id: N14MagazinePistol9mm + name: pistol magazine (9mm) + parent: N14BaseMagazine9mmPistol + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol9 + + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10mm.yml new file mode 100644 index 00000000000..55109e71bca --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/10mm.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet10mm + name: bullet (10mm) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 14 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12.7.yml new file mode 100644 index 00000000000..23f5253ea75 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12.7.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet12.7 + name: bullet (12.7mm) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 18 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml new file mode 100644 index 00000000000..f1c41e6824b --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml @@ -0,0 +1,13 @@ +- type: entity + id: PelletShotgun12 + name: pellet (12 gauge) + noSpawn: true + parent: BaseBullet + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot + - type: Projectile + damage: + types: + Piercing: 12 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/20gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/20gauge.yml new file mode 100644 index 00000000000..b47d9c00fd7 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/20gauge.yml @@ -0,0 +1,13 @@ +- type: entity + id: PelletShotgun20 + name: pellet (20 gauge) + noSpawn: true + parent: BaseBullet + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot + - type: Projectile + damage: + types: + Piercing: 8 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/22lr.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/22lr.yml new file mode 100644 index 00000000000..36f400f840b --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/22lr.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet22 + name: bullet (.22lr) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 8 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml new file mode 100644 index 00000000000..ea613338953 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet308 + name: bullet (.308 rifle) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 32 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml new file mode 100644 index 00000000000..02b4eadd44f --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet44 + name: bullet (.44 magnum) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 28 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45..yml new file mode 100644 index 00000000000..d90ab4b2ace --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45..yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet.45 + name: bullet (.45 auto) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 16 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/5.56.yml new file mode 100644 index 00000000000..9bb017d8044 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/5.56.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet5.56 + name: bullet (5.56mm) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 19 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml new file mode 100644 index 00000000000..f8b4e1e3f06 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml @@ -0,0 +1,10 @@ +- type: entity + noSpawn: true + parent: BaseBulletHighVelocity + id: N14Bullet50 + name: bullet (.50 anti-materiel) + components: + - type: Projectile + damage: + types: + Piercing: 49 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/7.62.yml new file mode 100644 index 00000000000..902f83d98ad --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/7.62.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet7.62 + name: bullet (7.62mm) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 23 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/9mm.yml new file mode 100644 index 00000000000..66000039ddb --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/9mm.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet9mm + name: bullet (9mm) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 12 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c99b2a0e2c6..d9a4a364a68 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -17,6 +17,21 @@ fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazinePistol10mm + whitelist: + tags: + - N14MagazinePistol9mm + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol9 + priority: 1 + whitelist: + tags: + - N14CartridgePistol9 - type: entity name: 10mm Pistol @@ -37,6 +52,21 @@ fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazinePistol10mm + whitelist: + tags: + - N14MagazinePistol10mm + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol10 + priority: 1 + whitelist: + tags: + - N14CartridgePistol10 - type: entity name: .45 handgun @@ -61,20 +91,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineMagnum + startingItem: N14MagazinePistol45 insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazineMagnum + - N14MagazinePistol45 gun_chamber: name: Chamber - startingItem: CartridgeMagnum + startingItem: N14CartridgePistol45 priority: 1 whitelist: tags: - - CartridgeMagnum + - N14CartridgePistol45 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -103,20 +133,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineMagnum + startingItem: N14MagazinePistol12mm insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazineMagnum + - N14MagazinePistol12mm gun_chamber: name: Chamber - startingItem: CartridgeMagnum + startingItem: N14CartridgePistol12.7 priority: 1 whitelist: tags: - - CartridgeMagnum + - N14CartridgePistol12.7 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -138,6 +168,21 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi - type: Gun - fireRate: 5 + fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazinePistol10mm + whitelist: + tags: + - N14MagazinePistol10mm + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol10 + priority: 1 + whitelist: + tags: + - N14CartridgePistol10 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index acd9a054b10..af54bdb8091 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -8,25 +8,40 @@ sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/small_revolver.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - N14CartridgePistol9 + proto: N14CartridgePistol9 - type: entity name: Magnum revolver parent: BaseWeaponRevolver id: N14WeaponRevolverMagnun - description: The Big Iron. Uses .40 magnum ammo. + description: The Big Iron. Uses .44 magnum ammo. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - N14Cartridge44Magnum + proto: N14Cartridge44Magnum - type: entity name: hunting revolver parent: BaseWeaponRevolver id: N14WeaponHunterRevolver - description: A heavy revolver with a long cannon designed to hunt big animals, it also works the same for people. Uses .40 magnum ammo. + description: A heavy revolver with a long cannon designed to hunt small animals, but it also works for people. Uses .44 magnum ammo. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi - type: Clothing sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - N14Cartridge44Magnum + proto: N14Cartridge44Magnum diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e0f7e5340ec..abc619081f2 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -20,20 +20,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: Magazine5.56Rifle insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg priority: 2 whitelist: tags: - - MagazineRifle + - Magazine5.56Rifle gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: N14Cartridge5.56Rifle priority: 1 whitelist: tags: - - CartridgeRifle + - N14Cartridge5.56Rifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -67,20 +67,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineLightRifle + startingItem: Magazine7.62Rifle insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg priority: 2 whitelist: tags: - - MagazineLightRifle + - Magazine7.62Rifle gun_chamber: name: Chamber - startingItem: CartridgeLightRifle + startingItem: N14Cartridge7.62Rifle priority: 1 whitelist: tags: - - CartridgeRifle + - N14Cartridge7.62Rifle - type: MagazineVisuals magState: mag steps: 1 @@ -113,20 +113,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineRifle + startingItem: LongMagazine5.56Rifle insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg priority: 2 whitelist: tags: - - MagazineRifle + - LongMagazine5.56Rifle gun_chamber: name: Chamber - startingItem: CartridgeRifle + startingItem: N14Cartridge5.56Rifle priority: 1 whitelist: tags: - - CartridgeRifle + - N14Cartridge5.56Rifle - type: MagazineVisuals magState: mag steps: 1 @@ -158,20 +158,66 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineLightRifle + startingItem: Magazine7.62Rifle insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg priority: 2 whitelist: tags: - - MagazineLightRifle + - Magazine7.62Rifle gun_chamber: name: Chamber - startingItem: CartridgeLightRifle + startingItem: N14Cartridge7.62Rifle priority: 1 whitelist: tags: - - CartridgeRifle + - N14Cartridge7.62Rifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: Service Rifle + parent: BaseWeaponRifle + id: N14WeaponService + description: A cheap mass produced post war rifle made by the NCR, chambered in 5.56. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + fireRate: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: Magazine5.56Rifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - Magazine5.56Rifle + gun_chamber: + name: Chamber + startingItem: N14Cartridge5.56Rifle + priority: 1 + whitelist: + tags: + - N14Cartridge5.56Rifle - type: MagazineVisuals magState: mag steps: 1 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index f399576f853..05d1e75a745 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -17,6 +17,21 @@ fireRate: 10 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazineSMG10mm + whitelist: + tags: + - N14MagazineSMG10mm + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol10 + priority: 1 + whitelist: + tags: + - N14CartridgePistol10 - type: MagazineVisuals magState: mag steps: 1 @@ -49,20 +64,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineMagnumSubMachineGun + startingItem: N14MagazineSMG12mm insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg priority: 2 whitelist: tags: - - MagazineMagnumSubMachineGun + - N14MagazineSMG12mm gun_chamber: name: Chamber - startingItem: CartridgeMagnum + startingItem: N14CartridgePistol12.7 priority: 1 whitelist: tags: - - CartridgeMagnum + - N14CartridgePistol12.7 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -96,20 +111,20 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineMagnumSubMachineGun + startingItem: N14MagazineSMG12mm insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg priority: 2 whitelist: tags: - - MagazineMagnumSubMachineGun + - N14MagazineSMG12mm gun_chamber: name: Chamber - startingItem: CartridgeMagnum + startingItem: N14CartridgePistol12.7 priority: 1 whitelist: tags: - - CartridgeMagnum + - N14CartridgePistol12.7 - type: MagazineVisuals magState: mag steps: 1 @@ -135,6 +150,21 @@ fireRate: 8 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazineSMG10mm + whitelist: + tags: + - N14MagazineSMG10mm + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol10 + priority: 1 + whitelist: + tags: + - N14CartridgePistol10 - type: MagazineVisuals magState: mag steps: 1 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index edc9643a14e..f40ab1294cb 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -11,7 +11,12 @@ - type: Gun fireRate: 8 - type: BallisticAmmoProvider + autoCycle: false + whitelist: + tags: + - N14ShellShotgun12 capacity: 2 + proto: N14ShellShotgun12 - type: entity name: shotgun @@ -24,13 +29,18 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi - type: BallisticAmmoProvider + autoCycle: false + whitelist: + tags: + - N14ShellShotgun12 capacity: 6 + proto: N14ShellShotgun12 - type: entity name: combat shotgun parent: BaseItem id: N14WeaponAutoShotgun - description: It's a magazine-fed automatic shotgun designed for close quarters combat. + description: It's a magazine-fed automatic shotgun designed for close quarters combat, uses 12 gauge shells. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi @@ -55,11 +65,11 @@ slots: gun_magazine: name: Magazine - startingItem: MagazineShotgun + startingItem: N14MagazineShotgun12 priority: 2 whitelist: tags: - - MagazineShotgun + - N14MagazineShotgun12 insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: ContainerContainer @@ -77,7 +87,7 @@ name: caravan shotgun parent: BaseWeaponShotgun id: N14WeaponCaravanShotgun - description: The perfect shotgun for a long jorney, works well for hunting brahmins, geckos and bandits. + description: The perfect shotgun for a long jorney. works well for hunting brahmins, geckos and bandits. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi @@ -86,7 +96,12 @@ - type: Gun fireRate: 6 - type: BallisticAmmoProvider + autoCycle: false + whitelist: + tags: + - N14ShellShotgun20 capacity: 2 + proto: N14ShellShotgun20 - type: entity name: lever action shotgun @@ -99,6 +114,58 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi - type: BallisticAmmoProvider - capacity: 4 + autoCycle: false + whitelist: + tags: + - N14ShellShotgun20 + capacity: 8 + proto: N14ShellShotgun20 - type: Gun fireRate: 5 + +- type: entity + name: riot shotgun + parent: BaseItem + id: N14WeaponRiotShotgun + description: A compact fully automatic shotgun used by the police forces of the pre war, chambered in 20 gauge shells. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi + netsync: false + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi + - type: Gun + fireRate: 2 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: N14MagazineShotgun20 + priority: 2 + whitelist: + tags: + - N14MagazineShotgun20 + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineAmmoProvider + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index dd8a1e32ff2..b710598e239 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -2,7 +2,7 @@ name: hunting rifle parent: BaseWeaponSniper id: N14WeaponSniperHunting - description: A rugged bolt action rifle. Uses .45 ammo. + description: A rugged bolt action rifle. Uses .308 ammo. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi @@ -12,11 +12,9 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeMagnum + - N14Cartridge308Rifle capacity: 10 - proto: CartridgeMagnum - - + proto: N14Cartridge308Rifle - type: entity name: Anti-Material rifle @@ -39,7 +37,7 @@ name: lever action carbine parent: N14WeaponSniperHunting id: N14WeaponLeverCarbine - description: A lever action short carbine. Uses .30 rifle ammo. + description: A lever action short carbine. Uses .44 ammo. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi @@ -50,15 +48,15 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeMagnum + - N14Cartridge44Magnum capacity: 14 - proto: CartridgeMagnum + proto: N14Cartridge44Magnum - type: entity name: lever action rifle parent: N14WeaponSniperHunting id: N14WeaponLeverRifle - description: A long lever action repeater rifle. Uses .45 ammo. + description: A long lever action repeater rifle. Uses .308 ammo. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi @@ -66,3 +64,20 @@ sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - type: Gun fireRate: 2 + +- type: entity + name: Pipe Rifle + parent: N14WeaponSniperHunting + id: N14WeaponPipeRifle + description: A piece of metal pipe with a wooden stock, works has a gun and uses .308 ammo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi + - type: BallisticAmmoProvider + whitelist: + tags: + - N14Cartridge308Rifle + capacity: 1 + proto: N14Cartridge308Rifle diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..62b1a6e7842c4982c21e66fb1192b3dd970f2b57 GIT binary patch literal 510 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0h38YK~z{rV;BXa zU=)mkQ83~GBa}t~4W>;0jm24@Jj#LZmS0%y0RgZ?O<~A?Fb@fs-`>Q)B%%oAK>%O! z94L!{;nUm{D2svN3hy%pQ9))f`|R~!3|`!_U^WQ+dvl+#1H4>}{u}8kF|6Kr04xXt zJzAf@j^N=FU|eu zYg_;n3U>u=g7K>7m!YDB0o(!SF5iQ)a08elU>Ft!F!1fiKQKlIplICe!-kR0KmZ&s z@xgjvNm)5H5QQ@>Py%qJ1GoUl5wAb8FknlJk;3m7sFf|z9f9Hi5Dg0jWblVwg+WhG z56UAST)K3Lp`)V%y8}P~!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*PmKm#r}n}n822^+L# zKD6&J+ccH!bEwd~MJFyZ88~Jd+$a-mIxkyyN+J0nm*`U610NLkIy0)WI5gZ_*l@M{ z3lHlWHuVSxnFHF24A1=UeP~>E5oq2)4Upj~%xr87o0?>Tjn6Ol0b0!9>FVdQ&MBb@ E0A27y*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..f545dc43b5e9a935cbe010dcaf666523ca735d93 GIT binary patch literal 646 zcmV;10(t$3P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0vkz0K~z{r?Um0< z0znkV$27=(xDk>REP;fVpiAg2$e=@z(7pe|lSfbfAA!ei9fB?$y#-w)gb;#-I;iE3 zRJPtUZ<*csvFq;M>I09NH#5%r&U-T}`RC7*U@gToO`CONq1)}c_Lm_DxIEiuUUY8m zo_$3uvDRTS9#Wf4CxYRe%Dn4?AP7h%lhly;eC`-OE(6vqijW>C!^Me7`?3vD1V0C3 zs^GT|ui7#Q831rI%!cmdI2UBC45X;we46LRGY~**-Fr-(O zX{*YDG6P4OGx{SSZ15mR1(Zr9@{v1mMBpjHz>6;w3c{aV^s62brGR`sPqWbL^=KCC z)K+N2Qo>$dv>5;q0F;6^*a(gH`FZT~Cd0P`<#L(z2-z{x)R3#gtjp);?_WM0pI_re z`V1?TijAkYEQ_{r(QGzdF_qr|cnKf^1Qd%!HY3t#G+2+2YPHIGa$2pHARzE7$Ye5t z@xcM`W$VCHCCZaJsifecgNJxqf`3-w0?C*aON6!lvI6;>1s;*b3=DjSL74G){)!Z!-~>+>$B+p3WC_;A2_ijBfd*V`QU*?$YZ5|@ z4%Z9hrfBm%n{WL`#Aos$_Kl%J^B!$!=k!Wuy}i!K;DmxCclf3s3TAc<<}B}YCj8?! zZU|clWIN32_^7IA*U`)UfR|BXL28u3DMn7Q9tZY6=?|s~FnqS(|AS$f=fmb3lg(=s oPVEC)>2^>9Xn#XrLn9-@Ouf3fd(C=R0^P>o>FVdQ&MBb@0Od(hJpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..ef3a6de69ee47df52d99b9aa9032ffb1064acf68 GIT binary patch literal 513 zcmV+c0{;DpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0hUQbK~z{r?Ulbv z!%z^%FAc=slM*U8If#NdNp*G=T$Juko%~ZeIrU#Cy7&h;iwcSeZh~a61O=g~tB7oSF}WyBzo4`}Xeg3MFHY#%#o%Y5L4n%9(8^&O#Ew>iWE2vvpY3br$(M zkDiw*pu%h>`|b9SMZ{R1k3S}@vQhyL8%Cg-V_8;YYt3flb1V9%^?KyLR)0f7@N6e8y9>O@A z7d==ojKHQr$tfg&Z;YfJK*>Qy79ehnytpo0Z_lu|5K0bbBmt@qM-l>XLUB^Pk8c(U zIaqwp-I$UShg5+he*jCS2CIi(!Mki@N{$Sv0A2;ou{H_bZTRWV?tV%)rsT*V&j3H* z3^fS(5sB5}00000NkvXXu0mjf D5Xar- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/meta.json new file mode 100644 index 00000000000..c06f0a92adf --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..50456d47eb1427a5255a60cc7d96bef7dff3a872 GIT binary patch literal 485 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0eVS9K~z{r?UX@F z0znkV$5jl12%#cul`^8vUF_C}=+uYn+^G-IO)qr|CDPDMq5_M^Lxd}Doc}sI`^Gic z=-~X|F>l_?y!YRkr^4ZIIF_EA8YPFdjZnFn)9$>*YJpgA*Dr-D#k{B=AIW*OvMooQ zUjJEnc5n`Rn>VfB3$PWZWNDb^agGz=sWD=|R+XF0FGZ3wKPT<|DxGWdPyhI6x4{P^@?cR4%h^Ejx^?-)tk{O;Ps;*9y&d1qBOWKUq}F< z-@;!35pxAxH~V5I7^-M?JozQ@7z`H|P(0a_@xjZd9EtMQn)0S`%ypl@8N|LD-IxIO zS3rx@13E|yqd813$gLs9Vf`PtYju@3#Y}?4WCRKl+!}ln_6Yzz#lQ3bAOXtF90+hY bmK`A`Ntpob#>$Xr00000NkvXXu0mjfNtMgf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/meta.json new file mode 100644 index 00000000000..c06f0a92adf --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..e820c571ca7d78fcb4109fcdc98bd649e62fa01b GIT binary patch literal 506 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0gp*UK~z{r?UX@F z0zn+b|GKgl53-TR!dwtM6pI*0x1dX1`v851zEyMzyw@=(!ssBhZAcgdl8eO>h-SQT zW_MO+O30h@gK_?|JIj0XW=1j?3li_^|&+{g{TpF!bOR1GPI;c%*+hsmXXkI>% zZQJCoJ@O}i6Z9**N;4b|wFa`q!ier3p4s61;wo-mA6@ng6djAId#9|SM!OA)b3M#j zmX&G%3(=*T#ScuVfO8#nw@1Bjoa$A;RKpGUXr9c;@eXsgu{n(otCy)&Mr?%uLW0hq z%Bv~6rDUrxPkeLJsnB>l{Z6$NYycCzL5^@1W(^e9%kepoMN5S?6A@w%(gAar*M2MM z4WQSh022UF3c>5ZWzS^f_dqpwHifwOEroB(p?p5iNB<*=BJzD-Z2-MULFTM^&kmW0 z9M=uoBCegTRuP7w+5muwm)B1|O6b1l=&;_8#bpq?h*;DR0gmG+YuNz1hKryQ$7+SR wTtjS8QVD?l#@5^)1`=2%asmc}Vbvk}0d>RH$5<!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*PmKm#r}n}n822^+L# zKD6&J+ccH!bEwd~MJFyZ88~Jd+$a-mIxkyyN+J0nm*`U610NLkIy0)WI5gZ_*l@M{ z3lHlWHuVSxnFHF24A1=UeP~>E5oq2)4Upj~%xr87o0?>Tjn6Ol0b0!9>FVdQ&MBb@ E0A27y*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..12942a5b70d943372ce175476b5998f948a911fc GIT binary patch literal 526 zcmV+p0`dKcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0i#JoK~z{rV;BXa zU=)mkQ83~GBa}t~*`ZwjMFp@*kqsJVf5mDbqnC@(eH@(zHDa@;%9>L7#O&F zenMHKfv+X(VEWz1e^?#C7$23!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*PmKm#r}n}n822^+L# zKD6&J+ccH!bEwd~MJFyZ88~Jd+$a-mIxkyyN+J0nm*`U610NLkIy0)WI5gZ_*l@M{ z3lHlWHuVSxnFHF24A1=UeP~>E5oq2)4Upj~%xr87o0?>Tjn6Ol0b0!9>FVdQ&MBb@ E0A27y*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..1bbbe44652bf84edea48fa3612cc637f5a12b7e6 GIT binary patch literal 487 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!h8j;7$B+p3WC_;A2_ijBfd-Elm8ZBdW?7Z~ zU+B|yaILm)#M=f&H+}KN|J`-M2Z;EA3B_(it zvN=9s?p)rdh6X-!t)?d4EmJm#cKpWe$ZpX2>3^a{`A@kSo2wo(TBQ9kSQZ8(MD6${ zWYL#!v4OjxhP{XdC~<Pswvn@K1$sqaX`6(yQ2~QYeIED0p zw!ZGy;aMQlc$V=B1B)!fqQr#_JX?I47wCLCxYT>Pgq4+5fi(k*Ltn)g5z{=!1AmX` zYjoFq=y_;!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*PmKm#r}n}n822^+L# zKD6&J+ccH!bEwd~MJFyZ88~Jd+$a-mIxkyyN+J0nm*`U610NLkIy0)WI5gZ_*l@M{ z3lHlWHuVSxnFHF24A1=UeP~>E5oq2)4Upj~%xr87o0?>Tjn6Ol0b0!9>FVdQ&MBb@ E0A27y*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..3e3577ab3da587952e44a60946fc22caf429b86e GIT binary patch literal 623 zcmV-#0+9WQP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t87!K~z{r?Ul<) z12Ghaqobe;x8kK0EA6J}BM5F?2!i+wf{H~c6np?dD3*!}K7$B?3%7!gptw=&!Yl5i z&|2%D{4trPnVih@h70{5oRdjR{`@(q?4LhRmx!F%naGz&+s4`XL){)aJ^}HGgy^-- z?cGhFfNl{zD(@xUKC2a9lVeoV=ZC>3z;PVjB(CdvP5o{Ha~j2G53XT6I>vL;f>MM! zhHup7_fL=3Yw$S$2OA!A8WR9i5m=;EY$C`S0L^Y*ey@5h2&)6nueAaTvlvBxUoYtb>A>af0{ z%H}~B1x!yq@TiJt1sniwN@rD!0xqs1Y11M=j$3)pmHf1BrsQbaae^r9)JFc#s~D)XKT1OSLg#(3H^*9FEl z_v-f~Ux9iJ@+F`M^J_WpaV~k0O%s{gBVtN~0ky>l#- z+Fj>4BKlz(1?hl9b)pkBVEr8cloRbD&;g0*A4xOlHSo(Y_6^foP4c=lu)qKS002ov JPDHLkV1hnb3&;Qf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1c37bf86fd0f59f7bfe698599609bb7226133870 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!-~>+>$B+p3WC_;A2_ijBfd*V`QU*?$YZ5|@ z4%Z9hrfBm%n{WL`#Aos$_Kl%J^B!$!=k!Wuy}i!K;DmxCclf3s3TAc<<}B}YCj8?! zZU|clWIN32_^7IA*U`)UfR|BXL28u3DMn7Q9tZY6=?|s~FnqS(|AS$f=fmb3lg(=s oPVEC)>2^>9Xn#XrLn9-@Ouf3fd(C=R0^P>o>FVdQ&MBb@0Od(hJpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..35440130e282d183f9adeee89e7cd79153739df9 GIT binary patch literal 493 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0fI?HK~z{rV;BXa zU=)mkQ83~GBa}t~Y_1ajnMB#4Jj%e2We>610RxO)E=K>2bd{i71n7Brnt@4>4a$Rn zDZ;OzECz<0x1vxM1k^LVU=S5#2D8sz|HUw0Od8Do_x=}NM=*)<|6w?H`5u_FdgB2& zmOt?otQiEDgxSHCzkdH0jzN5oI1HnM#8*$TilYN25CL)osQ~1NNeoY*JO+klL3xHe z1{pA3sHp_TAOH$Qjwt#6U=9`lb^r{7`a3{b5C98>e{X++4Tc3VE>QdaA=ptM9Df}W zs)PX3!nK#c@dJwnd;sPM7zXk20gxlWQG_QHz?R1c>wzU@<1?aK#q9*k%a-2BhVdiUzr7%T4|FlQ5*oGVWEHw-apyKASZ!8{)qvPUi@X4y80V- z2Y>*`5s#jJhVl?V7nm5O7+9e^%0LCfQ_>xvCHs;-Apio77K#|D^(gOmD2sCNYxfHb jJ4eAN7zHC4FfafB4MdPs=D`iF00000NkvXXu0mjfq1d!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*PmKm#r}n}n822^+L# zKD6&J+ccH!bEwd~MJFyZ88~Jd+$a-mIxkyyN+J0nm*`U610NLkIy0)WI5gZ_*l@M{ z3lHlWHuVSxnFHF24A1=UeP~>E5oq2)4Upj~%xr87o0?>Tjn6Ol0b0!9>FVdQ&MBb@ E0A27y*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/50anti-material.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/50anti-material.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..8f8b9ca8bfc9f6e67cfe66576d2ce98c332705ca GIT binary patch literal 457 zcmV;)0XF`LP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0bWT&K~z{r?UcVt z13?gnCmSz<9+DuD5Jb@~wa?%qq!tT75Ug#q&^HjQM8w7>kB|qkQz9xskpwx77tNmh z#$CA0UCtC6Qn()s`{$0EZ|8<3hr{7;Oq-k576#Nux?PU(S1uuscsHa_w-98X}cJ{Mh&t$mAP7ZFip3DjmqgD*}3bv zh?C+f$5m~eBa6f@Koth{fG)hU)jj}ezrhed6Ye%83&eZDCVvX-6yLZPAaUMZph@2g zMi2Cx?HrQEK|k0I`4XzH4^;pRS7D`+S5NG5-yYCeV=eBTA!Z!lvI6;>1s;*b3=DjSL74G){)!Z!h6+y?$B+p3WC_;A2_ijBfd-Elm8TqI@a&8F zztE@az@ER?3vMwo^~CA9{qHTAx*&$7qU@m*vpKu;jNFW03_i^VeqQDZ5Mw#9;!di7 zXbRir^Kt)=9{A$Qd#0^%y?x!oQkLYJ4fpVJRQeDgm4nOwm&8YkI%{Y$Tpphf+pM3(KA;S|1*0r+(I=?4xLzx!mnfx(QSt9*iTf`ld421X#wC-@}oxHMP7X~&lgE~ig93JGl6!r(pO z2~$j`pq_(B4 VX6N*KWCx5G22WQ%mvv4FO#t9Iw~_z= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0dc864a9bedd8cae34c52e06f1d671d27dc5042c GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*PmKm#r}n}n822^+L# zKD6&J+ccH!bEwd~MJFyZ88~Jd+$a-mIxkyyN+J0nm*`U610NLkIy0)WI5gZ_*l@M{ z3lHlWHuVSxnFHF24A1=UeP~>E5oq2)4Upj~%xr87o0?>Tjn6Ol0b0!9>FVdQ&MBb@ E0A27y*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..2a0acf854eff9aaf4fc572d96be98492e5847dc0 GIT binary patch literal 533 zcmV+w0_y#VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jfzvK~z{r?UgZ0 z12GiGqo>f~;GlREJQTV)_#qTr90Ug!Kc9=6gE;BpH*j!P3YG&qh}dhdo|PBxozHhK zxmu5k=87S~HsC%rHsS z;CVsydcArA@ImUXw{#L;`hz#43)XGUT09v|im1ZsKxgGspGz_m?bf2v1)~Ey8%z2} zfKTx%DsLKyfF1Y%8vr-aS&CHvxbWQ=?*JCRx_{AaQ}BD>B%moLAQu-7m$hu`S{+*G(sRp4%U@j5OT z9gsv|0lG^n0^r}!()AqYBj`URdG7-*0z<;~j))Htg+5BYfTKN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1c37bf86fd0f59f7bfe698599609bb7226133870 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!-~>+>$B+p3WC_;A2_ijBfd*V`QU*?$YZ5|@ z4%Z9hrfBm%n{WL`#Aos$_Kl%J^B!$!=k!Wuy}i!K;DmxCclf3s3TAc<<}B}YCj8?! zZU|clWIN32_^7IA*U`)UfR|BXL28u3DMn7Q9tZY6=?|s~FnqS(|AS$f=fmb3lg(=s oPVEC)>2^>9Xn#XrLn9-@Ouf3fd(C=R0^P>o>FVdQ&MBb@0Od(hJpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/meta.json new file mode 100644 index 00000000000..d4dcfc280fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..5d14efa4ce444803180f91f044749f863fb4b265 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;6qOr$B+p3w^KLrHX8`I&eeI)bgntzVg>WJ zr3KDMnQ|PS9}-rvD&bV@YOF7768Y)*!b0WD^LebR0yO5FZPj*(y>7nNv^;y)y5?&l z>>utGZx0BaD%JMTobksOWe<)*hMY3nyVL}v|4*AH5h=1{f+@qR`3+1*{+RnNK33TBSNH>q%DnAA*4rvPENIC8 zp}v6g$v6KFQJ>2u`)#j^@b&kKY{@-+SLzG@k5db0%l%8{dcmx6mpP!pc8MZat8m~e ZK26pzC!w8MGC!lvI6;>1s;*b3=DjSL74G){)!Z!V5p~yV@QO1vIOhm1Q8ySgqBMx&3Byc{#URv zief**-gtU)oWT!lvI6;>1s;*b3=DjSL74G){)!Z!V4A0kV@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;$Yjq&b*DU$C})NM8u wGaBuv{46=el*{d)2H3!!ra*%y49v_7F!lvI6;>1s;*b3=DjSL74G){)!Z!V3ntfV@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;$Yjq&b*DU$C})NM8u zGaBuv{46=e)oMW(^MuWcD-#YlHzYZD{%K}7s%WrapFGHpo~A$pE)8}b9){U-!lvI6;>1s;*b3=DjSL74G){)!Z!V6Uf(V@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;$Yjq&b*DU$C})NM8u zGaBuv{46=e)oMW(^MuWcD-#YlHzYZD{%K}7s_3xty=EDM>PLPiW;rGiMz6>6EE-&m kj9>q1fUOQ-H!xse*jcTfE_Ey94A5Z=p00i_>zopr0JUmNDgXcg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/pistolmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f1a2e8c9de272573a3edf8ab52a321e549126c GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;D1jS$B+p3x6^#NnhgZpmdAEzUleBXfAF{e zA?FccjXa*bsC^SOx81NRWZQL;*;C0QZr>lznLf|%-%0v8dEINdjlUMXufDiF{Z4YF z*JYFZ^AoR#x-8DP{VhBFu)&H+0;&O_qL$B{YU3a66`Ocqlg^fP**Q0r;+PxUa}0~r zJQ;c(OJtj=aDR|u5ZmpjV{qPhYO3dDlUCElOH30Pw%yv6>&O(bY=RA|yJm*U5vJcF z3XO9c`nC$48?c!cCB;1T`fN;L6Sl7WN&3Amx`x@N7E}c zYcD1t3*DvLmv}L3U};WSGM9NP!;Sy?OG@UQOzG&D=l{6Jj{B_b24GMyc)I$ztaD0e F0sss_iCh2x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ad0dc5b8ada568e2a8a3642cab627966d5aba5 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V2G!SV@QO1vIOhm1Q8ySgqBMc2R9l|{J+qr z?WyaJe1S0BZ(w*aQp= a7#Qli1(=iip7{XHXYh3Ob6Mw<&;$T1W;sIu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ad0dc5b8ada568e2a8a3642cab627966d5aba5 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V2G!SV@QO1vIOhm1Q8ySgqBMc2R9l|{J+qr z?WyaJe1S0BZ(w*aQp= a7#Qli1(=iip7{XHXYh3Ob6Mw<&;$T1W;sIu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ad0dc5b8ada568e2a8a3642cab627966d5aba5 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V2G!SV@QO1vIOhm1Q8ySgqBMc2R9l|{J+qr z?WyaJe1S0BZ(w*aQp= a7#Qli1(=iip7{XHXYh3Ob6Mw<&;$T1W;sIu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..a5ad0dc5b8ada568e2a8a3642cab627966d5aba5 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V2G!SV@QO1vIOhm1Q8ySgqBMc2R9l|{J+qr z?WyaJe1S0BZ(w*aQp= a7#Qli1(=iip7{XHXYh3Ob6Mw<&;$T1W;sIu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/10mm/smgmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..34c9ef97693746da1ba46c144255a0f8b0a954e6 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;15q1$B+p3w^KLrwixiZ)^2BDbyg5d;0sG( zt};ttJi=5W;#07^Uxrb==@YMv@4S|zKs= zA6sN?o3L!Z z`>0Mr|GL*Hv((NWTEP0_PkGq}=Zselk<+AdKi1B2pP}3E-%gQdc{)S$^Mt?bQyP^2 zUlhDn?@<1rYukFm$bzZ=A6(&C^LM+D&I7*xj8_@&{C{xDa)EBd{oi`_&IPv<8sDE) yWctt8%{zr5{h+=EU!M4ah2pOj+?4p0KCwnCX2q#y9X$pN0|rl5KbLh*2~7Z!lvI6;>1s;*b3=DjSL74G){)!Z!V3?!lvI6;>1s;*b3=DjSL74G){)!Z!V2P)TV@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;!igRh9YRFf}n(`5z@ zh2yq68j3c>$CgL|3+4Y=G6YDlp100G05C6aq@c5J=|w4cG# L)z4*}Q$iB}1Ij}V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/mag-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..677855e3795380453993ffab755a38762b8a1c00 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;8af+$B+p3WC_;A2_ifu2`!gYnv>I&{%_vI zW%%d!;?oATx766;_8sT3%6FBxB>qq}0uaQOhGugu{g}+PG)ug8hh)+)W@q0S2 zj-BzjkM=VRxn3|9ahGcH!lvI6;>1s;*b3=DjSL74G){)!Z!;3Q8M$B+p3WC_;A2_ifu2`!gYnv>I&{yWd) zIXyj&@v>FEtHdSox9TT-)HHmJEXtqB%B)`P?dU2gk#@}TkgOS3244|(sU~0ErppW* z3de1CHYl;*+4Gau4C|Y^>bP0l+XkKrx#3! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/pistolmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd6e8ad19ccc1714e019e62e9d2cc7c3a4a9ec6 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;C4?J$B+p3x7QAGF)0eLJUbHltQUfWfx*k$Nc zeUS0i<8DJXu8ldbb8g=aSS=I7#mcU+tkD17?R@en_EEHSynvLsujIM}G z!i_br^j}=9W!_t7&S0)+{&0DLaFK8s`-``X6-twWE?KO7S++O$+<8XMnH>)poI1XJ in-!lvI6;>1s;*b3=DjSL74G){)!Z!ppU1EV@QO1vIOhmgd@yu8oovrWon=7r<^RP zyu{u1#r5||qi#;G$vk}T>Y0ui7#N=ue77LbfXnTm21tiUPZNZrAZK8}z|i8#$E+41 Rz6fY8gQu&X%Q~loCIFcDGUxyR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..745da0bd0c79308c3d550b3d93bcce984afc56a0 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppU1EV@QO1vIOhmgd@yu8oovrWon=7r<^RP zyu{u1#r5||qi#;G$vk}T>Y0ui7#N=ue77LbfXnTm21tiUPZNZrAZK8}z|i8#$E+41 Rz6fY8gQu&X%Q~loCIFcDGUxyR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..745da0bd0c79308c3d550b3d93bcce984afc56a0 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppU1EV@QO1vIOhmgd@yu8oovrWon=7r<^RP zyu{u1#r5||qi#;G$vk}T>Y0ui7#N=ue77LbfXnTm21tiUPZNZrAZK8}z|i8#$E+41 Rz6fY8gQu&X%Q~loCIFcDGUxyR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..745da0bd0c79308c3d550b3d93bcce984afc56a0 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ppU1EV@QO1vIOhmgd@yu8oovrWon=7r<^RP zyu{u1#r5||qi#;G$vk}T>Y0ui7#N=ue77LbfXnTm21tiUPZNZrAZK8}z|i8#$E+41 Rz6fY8gQu&X%Q~loCIFcDGUxyR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12.7/smgmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12gauge/mag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/12gauge/mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..7555e5ef3ebb5082440c2e413ba3eddb00527388 GIT binary patch literal 453 zcmV;$0XqJPP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0a{5!K~z{r?Ub=j z!!QtrFP)1?*hrCJOv4C*zFS9Lf<6m-Jvm$X@QdGa5;}fWVeR{d;Ba`cO0&%GbR>Qi17R2_ih{Del=}T+ zw~j7H)JYPmZl(MksFflzfQ~R;h#0fuv!6y-7~l+h)JmryG7xsp zKnNF+jfH5YATqFAT6%qXb1Q>5O?PRr_?iD+yA9PH;1v(g^B#@IS5#F~7b6$eND&!m z=Cg!F!_KhBhY4%&9iQHccmjYs>vjz_&H7FtMh!lvI6;>1s;*b3=DjSL74G){)!Z!psA;eV@QPi+v6KK4;TnAJ3RaweST7IOe+6x z#d!}d-)o#8(qKO?<@~9=x{u3FuiA5;g@Iw#Bxc@hR{n)@5&wV&FnGH9xvX!lvI6;>1s;*b3=DjSL74G){)!Z!1{qHm$B+p3w^I_inhkhbS954}R4|@5fB%-% zg+KA&xpF7sN{9bWPJnwecwf(a$ zCwa96Oi~d_k9^jaIAMndm$~ocBd0gb@L3_O$(I-qI<;rXYb(jbBS}tEpL9R3e0RyD z^s~+B7tK2hWqj2h)rK%%-1pv7Q2#%CRnB zeDddun9TXvYNs~U{95jKUDN#EF9E?>3^h|2Ez+>=q^>bP0l+XkKaD!lvI6;>1s;*b3=DjSL74G){)!Z!pt+}uV@QPi+v6KW83Y6lT(D{7T%nW0A-#$D ztZ%`sKWh3Om-!lvI6;>1s;*b3=DjSL74G){)!Z!;4@Db$B+p3x0CmC9dh6~ws>_yyVcznDm%(w zX><75Et&kFVsWg_zNX0q(d~AQr`0Y0ml%1vw)}S7k+QR9y1sj-%cJW)KSTmWT&Jf> zhQF_P?^?c!)x`Jk)yX#JSFX#xI5*ht=mN>48Qy{14Xhj{eLLBI^7u@- zjSM;pekSWzy;5A18~u@q=_<>bITdHE4)2$oN3=f zdja2sod1nCnD$uhtK&Jsv~Ih@^3Sc>)=KZEtuEbuJMZ1ke+5g9)}(!spHbJibtjh( gmdKI;Vst0K$}r-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0146bc517fb516ebac2dd9174272c495c9ed123a GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5p~yV@QO1vIOhm1Q8ySgqBMx&3Byc{#URv zief*r-{vK&^RGpJRc0S&S?bC5>Qzue&AT(!D>#@BpRsV?u-NUO23TWHQ=kDCnB&Z0 bV8Fm&QO+}2qRG|_XaR$#tDnm{r-UW|Q2RMM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0046d390e706ccfa40355fe3a068748b4d0210ea GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5+B!V@QO1vIOhm1Q8ySgqBMx&B^IX|C?Vt z^l!{GdWCnrxBI~bj8{79 vHx)B-C_HZnG~jYOr~x*yr%91ZLV{uS0};c!lvI6;>1s;*b3=DjSL74G){)!Z!V6~@l!{GdWCnrxBI~bj8{79 zHx)B-C_HB!lvI6;>1s;*b3=DjSL74G){)!Z!V2`JZV@QO1vIOhm1Q8ySgqBMx&B^IX|C?Vt z^l!{GdWCnrxBI~bj8{79 zHx)B-C_HB0w^Z$Ni3c)I$ztaD0e0sx=FPzL}2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/pistolmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/smgmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/22lr/smgmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..08651f2050a0aa65f51298de7e2c75249d77547c GIT binary patch literal 376 zcmV-;0f+vHP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0S!q+K~z{r?US(% zgCG<|X&0Rx9Gv|IH^1KBFpdrmCT=>lIfR$Kk{TcB&<>o$AmqWhfVxa3lle8b&?eFM z{Uf}-F$_cUdPx%ymu2airt$rGo_(v?_dO|yxlqeLi8U!9OhqEs$SDZZG&x;k4RH_c zDP7l{%ImuJEl`70i07Pf835wl0`g^9Lhmz#53i?~0>tnQXgPho`xHz8xZn5`kTT9A z^7tFDa2a4-S9ctT7ZO4TL8u=AIdhnMh4~6tl-=qe5=L5Twr%rrE2iJDZQDmxRjw$C zF!BN!!lvI6;>1s;*b3=DjSL74G){)!Z!;2lpF$B+p3w^I$d4jb^eUY)lvg=20FQ~bf; z7pa@4`Rwz5Asbb?5?#cBew53KsCl!_$T)^0N}WjwcQ_fGxpFs1&|T7B+y;y>Q)dn0qDjQ@o= zL-q4(?;IyHEC@+#+AR12X!j`Fkk0>aHz;|2h)_p$9WVCG%tM8m*bs#uCZee1Jj8- V)=h!Vhk*WM@O1TaS?83{1ORh-e=`68 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdb2279d895b8cd638e319fe740d237b9b58e36 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5FyuV@QO1vIOhmgd@yu8opvLP8t1p|7_ji z1G*>99Z-FE=)>Eia&5iB=ZvSUv38%hGo|_L!lvI6;>1s;*b3=DjSL74G){)!Z!V3MbcV@QO1vIOhmgd@yu8opvLP8t1p|7_ji z1G*>99Z-FE=)>Eia&5iB=ZvSUv38%hGo|_L{uKbLh*2~7YT-$L5} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..35929f263c51f08d7505d42a7b91fd526e6c9a77 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5+B!V@QO1vIOhmgd@yu8opvLP8t1p|7_ji z1G*>99Z-FE=)>Eia&5iB=ZvSUv38%hGo|_L!lvI6;>1s;*b3=DjSL74G){)!Z!V7jM^V@QO1vIOhmgd@yu8opvLP8t1p|7_ji z1G*>99Z-FE=)>Eia&5iB=ZvSUv38%hGo|_LhxG89ZJ6T-G@yGywqi ClSpa+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/meta.json new file mode 100644 index 00000000000..e14243fbdf0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/pistolmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from Mojave Sun", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..9a4a7ebd966a2060eb93a8cdf9063440c9a37508 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!-~mq;$B+p3x6==DwI~R*9lvTc@x_DR`=j_D z#A*q}$lQtj_QFSDqC8Ks+!yzKTnj%}xV#Ltcz(&EFQG@%nBn!VN!OIvH4f{a-Za5! zkJtLNdFgBR6zXX`VUWzu-OX^k@Id9f8^wW%a~-@myO}K;u1U2eHe}8!@M$e&3O~T5 z!17Y}-{X5iag5$hOGUmt_o`sk;Y{v{J*1~7J+0;J{ubZ=tg(mq&&u4`#_PnffJAeqr!*^>bP0l+XkKBHVHN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c8c6c690b800ebc73a4211f826360dc925875dca GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V2G!SV@QO1vIMKLoPks3q=PfNEC1L3t>aCL zpZBFnvG!u!rZY)RmsFbX?mlNMbLT(HspNzilFxt0pORr+oFLNE6llQZc2GkC%5h*y cNMK-?{7B&O|GqgNf#x%Ky85}Sb4q9e0OX}Un*aa+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/meta.json new file mode 100644 index 00000000000..99c9b48f9fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/45/smgmag.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..2c6b4fe3e1bf59d4e9a37fd8ff053779c4644d7f GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AT%3$B+p3w^ufDwHWZQJ-EXwYqiBf)N=a1 z|8MrXyD#sP?dB`nqddvApIJE1>T}}~$Bz9hTwW_r?+&z8J@&)sSitwpS!&m8j__TG zTAZif!qA`C@Z4fk+9qa;=PPc%-o=--c0y3n**(Fj2m58^vvv1A6=ZdIz3bhoDHaFT zcQ8!}N|^Wj?fZ>M`l?(PzS~y3-@Z5bXq;F0hj{IXX{~+^*O%2=-ir_ eUYez)4Eg%zw(sg3EG__@&*16m=d#Wzp$P!i=Wdq( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..f25cadcee2d2464e554a40c6d76b585331d72c7b GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V7RA?V@QO1vIOhm1d*PK0~|{`*>0M>`oGYJ zE!Eajqq}io#x2H4XPFo$nSM>RJRqC!QiCzo&_HKqg`AJSZP8?%_MWCd11`6N8W0nJ eoFGPKW`-LlxtU8QCoBhA!QkoY=d#Wzp$Py%+c=y6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/meta.json new file mode 100644 index 00000000000..99c9b48f9fb --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..aa843ca6e2a906dd5caa4c7ace356ec761688ab9 GIT binary patch literal 390 zcmV;10eSw3P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0UJp~K~z{r?Uk{r zgfI|AXCDZng|%1-_WpvOF8BrZij`Q3g(6z)u~`0_ z2al(uY5L^1JIbbj2lzW;j%1Sklqs$vm>Oi&VlubZZc)^(*I2w3qXNthVqaObE=kI;7DZnXYe zmSs;^j$Rmsfw=%T!Z2ic+qT-h@LdjoyInAH;EsmW7Le!pYej6q{-7(uxCdapZ~;*k z5y$bVh)V)w7ZBfxsOy?PeavMCjzs8iY5$gySA{qyilSf#Rns)5^BW5Q;;<67s}={h k2mo@!sTQ|bEFS>TFU9GwW^w5>5&!@I07*qoM6N<$g3~mi;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3676c5f7cf71904f42733c7994765fbbf01b458f GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5FyuV@QO1vIOhm1Q8ySgqBMzj@x>F)oV<4 zjPw^em6V_{tE?fzcmv}i)9!lvI6;>1s;*b3=DjSL74G){)!Z!;73mv$B+p3w^METnhkhb@A64XOqgL@$n>tB z$8Q3s;il9RmtI|T>D5|LR(FN(rJz3XUUJ-w%&|OR3^@K zFklRtBp`iYZNcsc3pKNYjy6pPu4)|EweHCr<>WI<-8L}__#APNC^+Icjj_RgY0#

gTe~DWM4fhq;K3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3676c5f7cf71904f42733c7994765fbbf01b458f GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5FyuV@QO1vIOhm1Q8ySgqBMzj@x>F)oV<4 zjPw^em6V_{tE?fzcmv}i)9!lvI6;>1s;*b3=DjSL74G){)!Z!;1^F9$B+p3x6>TCnhgY8FL%vmxx4EF-%k4q z?(m%r;sGKDT~D`c+`4F6{g$atay4p#hVy?Ku3~CDa5H9yQ$%)t%iJT7 zz?}W_dF4CpU7W765vL{3&cCsj{hN}J1NZgPx2C3z&-@+OwtXr;ckrih0lSK2KBKh6 zZT}^iRrf3lMC7G^xcy_f!gy+al;2wWMSoi~nqC^lgic)_q`-XGKqu?`Y(~kB#}$Do ukM7zZlA6%?G21-+{`VSpg%9N#rR=xV%GSSFFS!@!e+ExiKbLh*2~7YfYm4vz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..8fd0cb384691e9d1295ff24636042f6649782aed GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V3?!lvI6;>1s;*b3=DjSL74G){)!Z!V1}oQV@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;$Y?VyIly@XRd-~TJ{ yJe|aQLa!t5UJctZplLl#fd(My1v~}@3=D!hWCABtXA1!BWbkzLb6Mw<&;$ThZ9lI7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..66008d71a4e768ea9ed5f2e4e0c959a32df71096 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5O&vV@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;$Y?VyIly@XRd-~TJ{ zJe|aQLa!t5UJcu^DNLJW8MOXR@OIeMbjRr~NV2af&;YEQRfK_!jiI_-(cHCn>mr~d O7(8A5T-G@yGywoXhDVVA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..148d20aedcee85e75d9b0f2a6a4d13a264c4eaa5 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5_H#V@QO1vIOhm1Q8ySgqBMx&B^IX|D9*@ zoSq)Xc-bo7RpOHPTlJGZY8t*q7Uj=mWmd2Dc661LNIPbENY;$Y?VyIly@XRd-~TJ{ zJe|aQLa!t5UJcu^DNLJW8MOXR@OIeMbjRr~NHU1!1Q%o0uX#G`0owoEf!aV;8UO(U Z!~0Zq>kamKLO=&Gc)I$ztaD0e0s!!SOfvug literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/meta.json new file mode 100644 index 00000000000..b22e1caa1c0 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/pistolmag.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/smgmag.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/9mm/smgmag.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..463ca000b2542337f0b4748894d525657a400834 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;A~G9$B+p3x7Q50jwlGQUbx92W+t}n-v5Yg zT?r34g^tb5c|ZSv*i80CY>Vuh8Bfl*{@Y`}>e7;`_o;3n*{#BAaCsdN$UXzkRviQFKS<{&_2z zYz{I-FmNX@K44gDD*5t2xzqDGXZBUS|FHMM411+r3p4`x=rgYHZxx$Rn<+MukO8d$-myEdcE%IsZyiS@U4x$^k`MUr_-rpOfZ(q zM~~KZJ+T5-t5rE14l){z0$JaBv?}1uW`9%8=d&!AOPNe2p$D~I z0|q{y&n2Bs>!;zeYTzEe+wJt5a9OK?Ao%fkBn3|yRt&_2qr@q=g=aFEm*D872$;K# zOrtrSPEsfo6nwkgz63{+BVf82;A}Rl*1!ol;5cv;$$)_mheNeFjRknG*Ha@V;=m&b zc)Q*9La)uZ{eOPnWlo!A)URLG(+J$3oV7XmU@(wUsieM_N~LJIu}nM-89?$)A7@@H z7R7NKS+Ca~e81nTG|XnRSmBRc0~pEY^J)#8I!Fpfzy8p`E0u~Y77NMcaul0-cez{= z!BM0Lbh}+2oU6$5q;T|f1C#g7W<$sGPHyJLND_r^V1D4-Z}N?9P1t~=z!Y4I%mr%T z!1w^igiSpd0N&|zq*kk`>vn%q3J(z>HAyI+0Rtb8$Ff?jFz^s&Od(q-@HV-JQ}Mup zOxTo)KoI;>@|>5*3hz-X&_{tuYj+WX z5*0)R?U}FW3NaJYl9agdfplVPzxwI4(w8sVgkfmxB{Le09`5rr?Wh9eo6V*nL0}vV z2F@T<$;u~_iE+src2wgpV-^mFLpq<&v|g`E9Y1zd0rK&9Oncc3FNn94g6y^9ypColYmd$FmJNN{$f$RF#9$7KnVcS~YN>h zS}p2yI((m(_IM4EjcJ$Ncz6t?{VU# znP)eq7XKC#Ii7FnwFIG=x$w|}yc|NjAV(1IAPoR=j8iDP$a%tYzu(i(Xu<(tVPuHx zK~brbB(Ybz@Gl$W_#c-oy`6tMTmg}Pf+n&>-@zw>;0hoJl-?NiJ?4Pu7f%{Arq&-? QSO5S307*qoM6N<$g07a~IRF3v diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png index 89230ef7e215d53e013538ed945ffbf2a052f8e6..f6f26d05e1a686c1b55734b43f4fdf1da43ae5ad 100644 GIT binary patch delta 568 zcmV-80>}Nc1cC*SReu5(NklRVtNiYtfe)wF>abWD*e* z7_-@|r-@(DJ-kw>7+&y*8nw%en1T6xo{q;O4F&^O*0&n93V-l&xlGsVl@^NyjmKlp zK(+UPz-O}=#bPn_)LU8&IN{svR_%C8TMxLwPp1<~@RXs&Kv+2Rb_wp`@pwEC914^H zIopt2H0Se~QmGWfH=9i$IOID6a+?91NF;a-I8qL97&zq1fWZ6xK7Sk+3*fC*i$|CU z1NSAstJSKNdVgic=yW;;=D21ts_npfngM6zSWD#HZkIBd48IqRMsekaGV!tmhr@wK zz|-k8-|hGC-EPNasMTt`4yva$0~8I1nq$o6a2w-Fw1|8( z8Zlgq_|?l2pziDS8aJL5xy;3gsM%~9%jME{^pNL^0>}AAy`g&(PIy?kmcUG-0jR(M z!w+zn(5VLlfY1pbNWA*%-f!?mjBAA!3HnNZWeAfg|WVQWS8dMywD0000$&HAo;IkH>U49LV!LIv$Tta#YDSh{_7g=W~|#dOfUk4h+{Z zVqUynhte0N@2As=GlT@_3lrcu8#(y*vdFQ&^>W*0`eBNv78K-#A1<>CPV4Q#%T){~km0g&?xPT3fy=y%* zY5u!_7vTdUA|j&S$T|1XE;&ZsQcCHyRnoMu-SP2uLYSUt@a# qPwUCe49_B;@oTK4Cn6#MxBz+RAgJyXPFVl|002ovPDHLkU;%=SfjgZ5 delta 109 zcmV-z0FwXK0lWc_R%TI2L_t(oNA1v|4ZtuAMA2(uU{Gf8{zDlVhNf!e1rkd||B;hT ze6j!l0DuZJTVsrsaa+k1S@souLPC5{V3gj#D~y8D&ue^uWP0Fv|o`l}LG?@M3a P00000NkvXXu0mjf6%H=k diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/base.png index c771e1054b25dc4280c911bf3b785737dbd13059..52a91a435154fa16be99151f3d013ec944aa1c5f 100644 GIT binary patch delta 620 zcmV-y0+ao+1-Au|R)0)ML_t(oN9C4HkJ3;ShF=(_LsAEZF;lTIX)_Cl7=t4QSAMY6 zr5nS~@CUjvaiL+Oi*ccugu1ANi35}l(+{9}uDzsGI>5Blg-_Dldz+HyoYQk}!GA-g zQt|xhzatn#xm;%REL){OwOaN1{XUzMT$W`vrV>D{R`a^uE`KCRn#pxtN2k-t_>XK3 zlJj!Y7+ez@iQxHzyG)=B99WjcGL6bS@c>9}m9a7s7T9JDCYiPPK*APOJi4PJB2yWuxtmp*!1b z9!2aP;0+g)SAP#>7#ElL@$=8VfA{%oq$gGY!G=?AOMl6)5_8sm1(nd59!E~BRRNL< zf&ePCF&GS(lxIE~jbh1( zr6(bm4~Ii|o`+JY#7?-$WD;9WT-k&{`E)u(p-_Nf7_e=d$&+B|E(pshd($*yXUWcd6}-1`!Xh3-ssZq)J|jK=0000Ld+U@p+`&u$0 ztX8WzT$k;sL>xT1cUu6=zK!vCEKVA9^4JX!K2{63p-k{|U@c4pr9F`zAl$gFp8mn^O>AGxiM@7Sg*};IYh#N219NG%W6OYqQ*ZVU#A<%;;K)8F z;vhxt0oia~_8n^@efS*6iDbaraICo>ei~S6?Gntpd2xrSC~#`63=qzd z%Bd#x=uQbcSGGmWn)B*~g;Sw3;DzUMIm{=TSYLl^;oFa1sD@jnP)_~uYPE_+qXGVw z&*#xsu%1J2U z!{HE))9ExaoI14$z3|y=22Im27z{*AcpO@J3;b}Z+wDd^xztJn%i#6L z_ffCcj}4@=DzFC(!*H_MEG)}HCiB-P;SWnXtkEy*T-e0Rx9?-g!U+-XhC=KGKJFIJ z_A1Vc=U`7`$-s#c5N?|PzTMoj-rkzCES!9Cm^fyDFy3z|zZtK_zioUuJaTt2NT$6~ zsW^PRza=g|NSa91fIPKSYH%s9iPYgz1g8rJ{s3}QN~xg&Vrl>Y002ovPDHLkV1mkL BGM)ec diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/icon.png index 6d3b2197a2371c1c901c7fab7963320036bc29ac..7d29d84f99d5dd5665d1a931e4b7f2834ba6322e 100644 GIT binary patch delta 654 zcmV;90&)G(1=t0UR)1|tL_t(oN9C5yj?z#R#}9+kfslbRW-4|=GYf|pgCho4ez4S~ z8{=d6C_aZz;1UxTCaheHA!8g}?tgZ>AW6~!-fp*{)9EDU zQ=${XIo;Sg$EZjgJiC8~0P4U5UDqj6ugF6;fN(vP2U)P-QX4Hyc%?m(HGuF#aUTwE z9zZcCKq{5;ta)%=jz&Qhn4|`qduLUQ)^gL zXq&s#_tMsDfPWX96J9=&LA#p3#g9Mx{=?@pPtH~boC~gaTUvo%2WAB>LCJNdZv#gK z$^gOzK>$3}SdZ^2aFE%f{`dZnww_-&%6A5w@JuEHwOWnZk6&7Fd1VlM(}G(kUrycd zYPAZDMg#C!E|-H=s|ClmvNShH^eEqx@hEk}P17VpXn*W)FBV@fAzV=u7z_pk<;ch5 zF~RYc!{^OrGq8z`FED&K9KviigKRbnqtOVG$>ai_PN!iqnUD!o5F^)4TnE=QjgD9} zff7ZLGJ+;hY{ajLjk~}L&NW960KF$4L0eg*#e=?QdpM5x#6ON);WsZdH# zEEeg<41dD_G{NwPibOXYo_=rNz4s0B(%KRrTvgQselWsbueV4$mc#sg%S9%RoaG*) zUOc*IzkE`$-@JOh@?B6ZWdLEgzge7#`EW_PVZzsM?fEDKaisYF9Y4-zk;@HY6R{fL os9CYWSxytN!&wN97Y^_X4S|3U^5Xkz00000Ne4wvM6N<$g1KogMF0Q* delta 646 zcmV;10(t$|1F>Meo}5q` zDwRreXZZgVWMbQismN=hSS*ThDh2?PB#FA+t~+0t5ixNC41a64+oWllJ8v`^)M~Z1 zoMp)fuxhnBM_e_B5^?bC!94*mdp22?C3YIL^VkglZpj6@B~9sff9RSBN_!$T0Jwfr zqw80%ke-)FmgT@R&p0s_VfT-A?~r;qC+5l}ne6G5E^hsygClcgwqwfx!=aA{MJ=rtp_BBc%@RI zdc97#m(S;^*=*A84MnVtvU@1>Vzg2}+_r6D2*%F)VSfqr5a5PkP_Ne$P~Q1yG;+Uk zxWDLjkxi_9fZ>C|fM&B9DT+eF;gB+!j0?|Zvos!$g$XE%kuw*rg7^D<@mr_U5m8lD zkr9}H*hp9tYu|z(IG;H{0OEK6XCq;?HUou1;S~JU(}&dBR;gC2EfpU(saTFc*LCq{ zlgWf&0)GPhv7wQ)b3t^!H*epC21OFXS;zz~XG$;j%k$SSpD(RBuTIqf;HLTS+l@KW z>`gUl0-Y}o6H5jF!~4zhoAJt;*!1oDi8G5qoc40LJjdm|m$>{OHj%0U-Zd*VILm7y gbvO&)bm2sQ0hAkMHlw_m1poj507*qoM6N<$g0JB@C;$Ke diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/icon.png index 1232aa31df342d78492a14ddf32e6fd403a5b7d0..8864e8ea5891006a1e72413b86cf6a58a9961a5a 100644 GIT binary patch delta 601 zcmV-f0;c_w1*8R#R)0B3L_t(oN5z!Mio#G3MXLoza28QSL_`qxE(8(uFZ^0JZrzG| z5d={b6=&1lA{AmfiAi^2UkESBd-2?wq))5U=_u+gE1<3)5#Z%=`Nf2928@vkd^VfW zXf*m#U;870>({|xpcqa0DuH#oU0b*>sVEc*%H?w5`+Po6xqn>F|Fnw$$C}Axlvb;y zVC4-9dFl%A#bWUVXsuSG&1S>zSF07R*K1RjXH#H=FPBSxzu)h9wUTQCl48BgA`b?G z3_qXGRIOIklRxFk005~}>cxazM zhr=Px(6bM4xdMyceuNC5nXKT4!-1~XE5HAZ2}d6w6G*j80WxBQBU97q)O!O0Pb3oD zXn@}Dcit0trBb2e@u*FO8zXNIq67j*qs3w|G@80g9Dg~QFdB{Wvlww|!gdM}J=S)+ z{Q{R-V+9Dn?RLv>G2&E~E&)f=g~MU~@n4XB%~f z#Kdn$&P*>Q0348bJkHMo2M`zF*!NPJ0fD2laY1IY{dhcHvh-K60V7;eZkB5N2Y4w4 z7$Zuj(^7Q1-DtPld0KBX1ppUFv)R<(QU<>jK*PZV;Lp*bVzH=|!SCob)$4Ud%7C@s n?`zK=lbHAyxJaLg&xq(7_~y4TeX%rA00000NkvXXu0mjf-Lo7% delta 584 zcmV-O0=NC71(OAkR(~i-L_t(oN5zzF>%m|Y#t-GOJWC{bAtmpICQ@%=I-EP+s?n^0(#iDXPpZUH}C{RA1_kX|aBES)|*{srPwG>2N zcq31T5b*hY9ssmftI=Yypj3BTyI*ef2oqxiij}@?j_j)~sqdLpw(lH#e+>A0~=-$DH!y)#dCEOPEGe`RP5h{SJ zV8#r--|y*ix$ygMOxXHB22M@^Dq@7AQj^KVdjkSbCX+m9fZlF5UK4n=TBXC`!1Dk( zG4gRES|D%?T09=dpsB0GnPUiJu^2y#5xXWVPXV$=Y=5`gI=J*25g-6Jn+?Ooh+VyP z2{?u>5{dASKPsVRj{EU={PJz1(O|=_S|C|NsZ@&3Hu?;SiEodbnRG1x9FRmJ!OsE* z5EtNB_fnbxfn&09L1t(Be!uIgPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0mw;2K~z{rV;BXa zU=)mkQ83~GBZ#Oe4EYb{Apw>z+o3G#f`-{&!FIv`+yVOzodyfQfSb`91|fbXD35`G zyXPmAMLPIe!VYCIFueQt55*B+8_r$6$KYgV%JBC6S2$k2mlLcQ1bDcZ!E~M4Hioxd zEnpgk#hIA#Vh{l7hnay6zz$FpyaDDA118QfV#rT92gm6uo5AAOIvT+knGM1qNBnR4 z1{MbaP^dPfa>Jt>5yn6e>hAz$VFJcFE{3LCUQiyyA;>_hq8^Nq*)To~U<(CsTx5rG z{lEWSgTY8wiDC7|17Halh;;rAb~Q*dvQNkXAWwYx_7^1`z#Rah1!W*UM0NzS1E>K& z4gdj|BT%9Mlo-(gEHQ#KQUjv{cy>S!1!VC4$u@ zgVf=oVUA=0lO%%P8QKiR8CRh^2p<{v`};##2sSzm11O1*m{33l=oZ7k#*G`{G%_1T z!`L8zVPTv%Cq^QmWg5WhV{}J=954z-!7v333;!lvI6;>1s;*b3=DjSL74G){)!Z!V34PaV@QPi+Y76C4;b*YJj`CWaANw2f6kJU zZOgKzGXCo5`qw`v=h0-K0S%#1*~&`CWb$vP*A>aV-+TJ**DXgTF@>rc?=~{tzVqMp f+25HNR9-U7>JPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0r^QpK~z{r<(11$ z!ax*;4-y(Eh7eF})CGx{5TaX??n!tCo|cC&vXMj8pH8O%Uv2?Fu3nzf{L7?g-K58v9_q^F6u9N@hQ(LI$vgnJ+^}rE zx}Qw9z%T!_Hl(kez2yg)RlqO*ULTf&Oacg#n-NcY>@5&y8_Z_20_Nvr&}~if$fINr zVg&$MqtPJ4FxY&xT9Ij*BuNq>h_g~5mK;Rh0wEud#|1PLAs-9|Z2TaZ=9Uvn9vR4c zz22_$JQ!y<96EUJcDrokuVZnr0`APkTx32Pji_F)v#m%1dwaVsxIZgz7h)JZ6guK~olBQ`S%Q7t%3;s5_92~3wnhZu&RXuVcO(O@tehm3l zrATi}n;kR!jF98Z+l}kpkC}!d9|MT?YS|7|wso@CCTYtx-IP}Jy>aO2Vq zx1$1RE-1IYz2VSyvmy|{J~@BQz`FQ1(&7ogFUNfz27=0pU1okcZZ-7w%=@|zPX&_P y=V|d|hbknwQq$n60E8&}F$tUk1cB`T2}D0wZEcn|^flxF0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1La9XK~#8N?V3MK z6hRcm2hEu~{v6x|6Qe=V1SKYFBP17TG$x3Zv7x50u+iSi%HE2?f|}0CNTVeQcA6Ln zm>{4LV>oUR?&NZ=e9O#bIQP%&?%UxunP0Nm+0EVVd*8g7-Mep?A%%>MjoG{zn-hFb z0%c%cTp7AbdJj?ok_O2yEr0Idha{v*03?6yOx~`nd}P@3)3G2GU}Iy0x00iDwws;H zo#aRHAr)YCb(OR{z39xesQ|jzt2cNnKBNLXyxgDoQvkGO1yD^&L9CUlyhQ_<08b`v zvWZ*Q`4K&{kH>9n{E!SX0rJ@lZzapOYJ)9X`}`g>_XyTqOZ z7tRmZxy~+DtJTP!II$~W?%8CsER#&WSS;FK*VdcY9~>M!{ud!R`N`?I#F7U+-CewO z@G?{?IeUl#A+VwCoD4~10p#Q#ynK^r@_tyB#aq#c6gb8_Z#I)JjgHt$D_@+Rl1r5e z^zhc!R>$!0u#Gt&o6WL9zK1=(dx=$dcNpfNC{-A`0`Mrp&9Le0c_fcX@aN{Ha|{t6 z`1p(2W(=>U?t~r&p%Rd9kmQ8t2gbWqsT@Rp^!C$}Baxm$k>-HoN*-Knl-Z5$zfMJ9 zP98@KmjPdc-^SPZYqH9eWCW`b)Xt^;8S2I zf66JPse7Z&xpw{g8J>k~(a*eHa4GLCPFo}&b{)YH0o?p{;l%^l zqn8oM>slrQ(DQJGfo#%-T}R+r0bx9Mx#x9Fkiww`vODaDS5BT^hTmVdcARm9Ibd;d z(HR1=A&C;)E^j++oyqg2>pew`t?LNp7e2Vg=Q#(!d&dO;Jb6qka`J+{LZ7zeftcyN z?ui)P))9E&svvJ3V%sd=+pBFIa1g3b8jN?hbp&pmcmxO_ivR(i+i`aoz{Js@H?ZxXvHFi${WbZwVRPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0s=`yK~z{r<(AJ* z!axwlr!_QK3?W6aQ4b_yLP))u^iIMv@U%RHgo_-wnA8Y_R8wmUR=-V`w58ZTw0Q8l zEIWn#zM1LlLVuxlyY2P+eGi{S7CE8-?{qpeolgBoiBeUSWy!@e$Lfd56Nd-aqrth- zzy*ITMfYl*0WY-&*7MnHw!jHlJFUk3d8^n{*2Hf+q0At0FfjdHVnF(G806%OtFLG*a#CT=S> znLn3IQL`S~f;c#U$PjQGyG3coz&^PDmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zOGZK~#8N?V7Pp z8$l3;2P8TaBjJX`q_HJj8j!e@X_6FvgggvS!y`}t4JAiKc}O-Dr6c7?I*=~<&pXzF zbojhCOAP#t;e#KR>o5<^g^5>tC(y$ohwk zx$77rk>>jkS=kO$A%qY@2qA~$r%`gVaa+J`t zH#Gp0N-r;FCd4}9Lu`z(yEl;Ga9E07Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!v9mK~#8N?V7Pp z<3JFGhZA(@f@Kt3`gOXhPxtthX=S1 zhfc7WX!hC%R<4(U;@S(6Y)@PQ5dZt=k8JPMq~DL+oO5(GfN_?snc{J%_~7RH zU3?gZ&d=u!M7>(AO1Ilhv^(~OZX}&`--xeNDyA)h0}wd17j5GqFxO8z@mfDE0o_^6 z@&92A0#BkX0=B)dU$wa24j;Ut;sMr@dJWS_-v~v(w%4UedGFw%m#0T*zP3%@HD!v3 zM*nu%Gc&^ura93Kqu1+wxLGz5b>e1pT57(FPC^JFgb+dqA%qY@$dtGe3-e@Qe`rFy zs{#W?&BL&T|C<{(18k#aY2d=eyFen+PC?JYP(dB^35j70imRUs$ z-+^>})}(d-a)w%jP_Nfz|5sCB*es$0;8YclT7|5?XR17)8UshvcN=nXd7gOPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0m?~4K~z{r-IYC0 z!cY{3k7B`SQZxaRDoiA%i<=1xD}xh%$-hNhbu)3mFc{Hdz}8QoP_zkBeJ^d&KwDaR z!GvcyP1D@xz4zRc(ppm}6fAdLDQ=W?YIclrbn!A3i0FJ!( zP_y3<{p=lumV<>`;Fh1s2PAH9v6|?%L(9QJ0jA|w$|oJ~r&x_jZ*w-y^C$ z_adzs>0{nE>pAFq)w+p$#j;q_YX2h<5+Uw8vt?~H{``)k*d`yC6h_|3q-@=kOt!f-M8Oj z$$@7JyyUEdv@fSrZF*Z zIq+-&X8h^ql08EXDUO}D9QcmmskBS_<1JMx75mL{nAs6pfQkU%;$@PN*QJ}rcTog! zLR_mx?0NUYw*?@Zo&;DXfdN**zXu2e_rST7YYNdX1`QoWz<8U?00000NkvXXu0mjf DIQ{(T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bb9eb8a2802034cedbb7d739ab4decd6f24c03f4 GIT binary patch literal 623 zcmV-#0+9WQP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t87!K~z{r-IYyC z0#Ou(-!e54KLQObT?yeP+ysKSb-pX>~dIVqq_?Bv%S4eG}j zmybP1zv<{*A;pFXUul2ly)W z`~An+Y!;-L9yHyx;F591bHC3W{5sqR#-{wI0ADdYOPI(xNhSaQ002ov JPDHLkV1o7-7JdK# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..094f41966e1cfea71f70ce8c3101e7f78cbb72c0 GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4Uars978JN-rm~pbvQtT?Su4D*QJFgE-lgv zUDNT%{>_pF3;1fe;t#2pY*4c3kT__iapNH0vaNc26ZOAL2@uRL@;`9sd-EirV*euh zysm#2_kq3c?_XBzv7PxOgJb_(b*LvnlvnXx?|}QV+wL-7X{b)T ze5JLDL8_L~tbpGnsblk8uQ|&boodT(Y}G%&mi1UJ`u1!#Tb2p;{LcUdBW5XY%IQp3 zoSbiKJ1cDU)Eb5S&n;ODdO+O)+@`6Yq->e97)_*lE%M_VcxT#V+1-!fsTM3KS-D=! z;od$5>6a%@@1B=8=RyQ$YthaB$7gK4I`zkgg#X9a+nn3|PyWODoh;`=L7$7#Q?SwfgS`N$Egj780|OG3??El;>cac|+^J^I=EM00q>o#Io> zhxT>}IB_VpfCv?y!v-?>TLXM5a#aNGZ?nD^w$Jiryu_>iE>nji;m_0d&ik_|=;9pl z-*<0I^>{EV{QL0WglPWlZP#b#>&>g@kx04KCZ+J`?B~rJ1?#`2Oy7{OH*UT4)+pU; zEalJR3ND2Fj-0x>O*`(g$@Z-}tKa{tWZLMxC*%ID^{*~#wjTTUnoHngwDILvk1rOn zUo5?w`}oco=7SZAb-V8bUJw?mp3dm_afbJfIR+l9uYO`bYuzFIQR&_5*|&vC9Q%G=D!wEO7#=h^d&j?VK}C);`xgiC2ETIEj*@SGH#+ zdHB03rOJj+MZtZh{+UNH&e9D^EsxK3$#Zn6yCpK6Yb>d~#gp6cyUrI^BBiX~L>fcq_+j|McIx&-fgeapH~FLbqFzuk7zKGcXAWFZ%SsQ{dy?tz4Ot zZZNQ@GcK&%Vbgo&Fu!*|P5xS^#TPx!J~_hHQE~G4>Ai})!XGMnSBIWpMn}!doQ)Oc@NGu6{1-oD!M!lvI6;>1s;*b3=DjSL74G){)!Z!V5g^xV@QPi+lveNjwlGUJbW9;!{m8Lx#8L0 z_!gGV0}F1Sku9&gIr+2XER(Z;mN>ZpL5bF}iudl5uiJ%sX_kAv)E9ik&}04lNVWdf zu;LaihUEK&b0!pPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0eMM8K~z{r#g@HF z#6T2Aui97$7D5Vbtc;Ci$~=ItlPB;+?0pBz*rl+rP;8V1w}^-e{vmipDhI*u0wrHuU(wIgJ>tZc7Qo@Fe|`ZIoRUS8zqn9n3k`fboa2Jx9?vsIhfRhx*R_;X`0gZ!I8Hd zc<(@0jt5OuRcB)l92;I=GRgVUWJZqweswUUES0VdrAkfZCdGdwjJrwUL#M(jYS$`#gyloUv8y~20|kmJ#cmoAr}SBa7X z{U;TbgOJsOmBohSp~Z^!2yAj`ngIVL2ko{ZgsI^qw;%L+K=PI|(OX=FSclvSLhxH* ai2eY+G4YvO@wTe~0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t87!K~#8N?b^Rf z!$1@V@K<$I6rBtrII0v%5$6tq3LX3h{4>-)ONT-g>mrU0f>d{rIEbR?R<-gya&nX= zHkZ5f*Y^V<{~KoV>d9>rg)o^&4VwdP)i#d(ynSms+jX^R5p?or^;7wNc~E1%lh0kLSZw2+j&n4m z#Ep-nxFp9Sc_JbrA|fIpA|fL4K<`EL!pY|7AnLUUUJ8&$S4Yw{`qs9C#)v$U*KnB8BLliQu+J9_d4p?o>l{JiX*N}z7QpQ0@L2@JHm_w$JN=#RzM}eiJG}8W zBS8?PYK-WGP9B{jom=R-Qzgv|aC&oK7Qv=FBngs_>mSf-KJAve^8$d6A|xfBg_i<= z%Odzn9=sI*^tAl1J0yute&{<#Y`Q>felyT)5*eA~iHHV|$S-VTVG!Sa*IWPq002ov JPDHLkV1k);6XO5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3d27b9cc19b1ebc30ea4bfb926d22b82ee1ec761 GIT binary patch literal 631 zcmV--0*L*IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t`t+K~#8N?V8O> z!$1^;Z`Gxu=*l93OO-+?;<^h#g)V#nA47d0A3zs{D%Op-5*LD0mx4%Lh@$AOYUPBv zC8o_!(=;UM`Cv#oC3o(*ndw012qAZ0`bL# zSwRbnZvhVW_c|3$GS0UjY2FA{DwV8ex)K3q!0!5z)l8Q~KY9AjfJ&v(KC7Qgxm-3q z$pLTu=IKq)>>yVZ0lAwlS3C=V0L^C83W#e`asCF_bM`BOYXMaJ#>}U@Tpmf|q9(ts zmiab$*p~rvMb60GuLwQ24Lq>AvMlZEV|o7iwx(E^EhbKMJJdXNhnSz7klfmiH16)D zTCH|z=;}zLcsGI+;opZWiC6rJ(793Zr?nILd406{(k@=nuaA5U-4qRze6Ngb+dqA%qY@2nmP&x1KcuIYhE59t0`?@Uo%A;UbA+3|BA% zoGuIi6GEJcVXUZKDuHGI&IoZ(>RbviA;3N2b^aa|7-JYtmB32?4C2HX1jM$F6(xaB zfARLU0Ebr()^pm2qv!hjl;rdIo+gArQ1Nhk4CBbY??Ac?GzohVyqp+efcRni6(R{X zj3UG#9z+%}$|A%i9z+^cmxrqpBLFHs^-dL6Cx!=Mo=G%egk(lMA%r9!kv|viUJ%5^ R*$Dsu002ovPDHLkV1f_X3k(1N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json new file mode 100644 index 00000000000..4ba4b9d2ad7 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Fortune13 at https://github.com/fortune13-ss13/Fortune13/pull/667/commits/3875432b7113c58ce53056d7cc662a979a36a4b8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From daca4cff05ed7d99c46e245120a7591859d8dc82 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:37:21 +0100 Subject: [PATCH 04/43] Update 10mm.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml index f6f1dd8972c..78957cc2bc2 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/10mm.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\10mm.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/10mm.rsi netsync: false - type: MagazineVisuals magState: mag From 48c7e947d0cbd3cab1d7e4f659d0725d6fa292f0 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:38:00 +0100 Subject: [PATCH 05/43] Update 12.7.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml index 2e2ab857a81..a8637ae49e3 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12.7.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\12-7mm.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-7mm.rsi netsync: false - type: MagazineVisuals magState: mag From d9eeceb3f8f437b197f8470e3b4f9558dfaaa6df Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:38:35 +0100 Subject: [PATCH 06/43] Update 12gauge.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml index fbc9769768b..f33f4631172 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/12gauge.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\12-gauge.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/12-gauge.rsi netsync: false - type: MagazineVisuals magState: mag From ee17c5a442bdc961146cfa76e87f6ee5cf98ee22 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:39:26 +0100 Subject: [PATCH 07/43] Update 20gauge.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml index 6c1284457b7..cc60c2a512f 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/20gauge.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\20-gauge.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/20-gauge.rsi netsync: false - type: MagazineVisuals magState: mag From 6d2201fe4a762160d59b6cc7de525a54271de1c5 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:40:10 +0100 Subject: [PATCH 08/43] Update 22lr.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml index bb73ac264e9..936d06fb88a 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/22lr.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\22lr.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/22lr.rsi netsync: false - type: MagazineVisuals magState: mag From 4523ec55cd3412cbb46c073af659d9980548b5b8 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:40:43 +0100 Subject: [PATCH 09/43] Update 308.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml index 0e616ca52ae..1e30b040dfe 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/308.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\308.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/308.rsi netsync: false - type: MagazineVisuals magState: mag From c51f675bbfec4e39dd8e471a0ff5a71dddb24ef8 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:41:16 +0100 Subject: [PATCH 10/43] Update 44.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml index 82f9d61e00e..d106f102102 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/44.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\44.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/44.rsi netsync: false - type: MagazineVisuals magState: mag From af516ff318825f557eee6309c751f7b1e9cf721e Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:41:49 +0100 Subject: [PATCH 11/43] Update 45..yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml index a1e52fe728a..9449e13c573 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\45-auto.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-auto.rsi netsync: false - type: MagazineVisuals magState: mag From 30c24dc877f6c2910f191e03a36cb22fad836946 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:42:22 +0100 Subject: [PATCH 12/43] Update 5.56.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml index a1e36c8f0ec..333cf80aedd 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/5.56.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\5-56.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/5-56.rsi netsync: false - type: MagazineVisuals magState: mag From ae6825e3e78a1b3b223fc417e798d7734ea77f68 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:42:59 +0100 Subject: [PATCH 13/43] Update 7.62.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml index d9c247b328e..9b278e7aa6b 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/7.62.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\7-62.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/7-62.rsi netsync: false - type: MagazineVisuals magState: mag From b3036d1774c200fd64f546ef4fe6865ec6a39cdd Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:44:26 +0100 Subject: [PATCH 14/43] Update 9mm.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml index cc175ad01fa..60051c8884f 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/9mm.yml @@ -16,7 +16,7 @@ containers: ballistic-ammo: !type:Container - type: Sprite - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Boxes\9mm.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/9mm.rsi netsync: false - type: MagazineVisuals magState: mag From 0e52bcef223ee00362ff380a503daf56d92594a6 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:45:09 +0100 Subject: [PATCH 15/43] Rename 45..yml to 45.yml --- .../Objects/Weapons/Guns/Ammunition/Boxes/{45..yml => 45.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/{45..yml => 45.yml} (100%) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45.yml similarity index 100% rename from Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45..yml rename to Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45.yml From d2184a8b8b5468b89f734499d8a233c6999c0c63 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:45:54 +0100 Subject: [PATCH 16/43] Rename 45..yml to 45.yml --- .../Objects/Weapons/Guns/Ammunition/Magazines/{45..yml => 45.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/{45..yml => 45.yml} (100%) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45.yml similarity index 100% rename from Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45..yml rename to Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/45.yml From 6a24608f92aa7b3aac2709b6ad85038be8c7d889 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:19:20 +0100 Subject: [PATCH 17/43] Update 5.56.yml --- .../Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml index 96f6c5d9eb0..dfbcf48f077 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml @@ -21,7 +21,7 @@ ballistic-ammo: !type:Container - type: Sprite netsync: false - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Magazines\5.56\mag.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -51,4 +51,4 @@ capacity: 35 - type: Sprite netsync: false - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Magazines\5.56\mag2.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/5.56/mag2.rsi From c4ef18f8d474887f15e2928bb143fd03f70e2005 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:20:35 +0100 Subject: [PATCH 18/43] Update 7.62.yml --- .../Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml index 7c2f82b29ef..694715bfd26 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/7.62.yml @@ -21,7 +21,7 @@ ballistic-ammo: !type:Container - type: Sprite netsync: false - sprite: Nuclear14\Objects\Weapons\Guns\Ammunition\Magazines\7.62\mag.rsi + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Magazines/7.62/mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] From fb828db1064aa1e62e4ad617293971b20b35c6c8 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 24 Aug 2023 15:45:57 -0300 Subject: [PATCH 19/43] Delete .308 box open.png --- .../Rifles/servicerifle.rsi/.308 box open.png | Bin 563 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/.308 box open.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/.308 box open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/.308 box open.png deleted file mode 100644 index 82be147915da59bdb3bd6267cab9be0dc04e78e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0mw;2K~z{rV;BXa zU=)mkQ83~GBZ#Oe4EYb{Apw>z+o3G#f`-{&!FIv`+yVOzodyfQfSb`91|fbXD35`G zyXPmAMLPIe!VYCIFueQt55*B+8_r$6$KYgV%JBC6S2$k2mlLcQ1bDcZ!E~M4Hioxd zEnpgk#hIA#Vh{l7hnay6zz$FpyaDDA118QfV#rT92gm6uo5AAOIvT+knGM1qNBnR4 z1{MbaP^dPfa>Jt>5yn6e>hAz$VFJcFE{3LCUQiyyA;>_hq8^Nq*)To~U<(CsTx5rG z{lEWSgTY8wiDC7|17Halh;;rAb~Q*dvQNkXAWwYx_7^1`z#Rah1!W*UM0NzS1E>K& z4gdj|BT%9Mlo-(gEHQ#KQUjv{cy>S!1!VC4$u@ zgVf=oVUA=0lO%%P8QKiR8CRh^2p<{v`};##2sSzm11O1*m{33l=oZ7k#*G`{G%_1T z!`L8zVPTv%Cq^QmWg5WhV{}J=954z-!7v333; Date: Thu, 24 Aug 2023 16:07:45 -0300 Subject: [PATCH 20/43] Delete Mag-0.png --- .../Guns/Rifles/servicerifle.rsi/Mag-0.png | Bin 189 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/Mag-0.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/Mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/Mag-0.png deleted file mode 100644 index a3ea2ce8de562c8bdd6614be7c2569610f8252b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V34PaV@QPi+Y76C4;b*YJj`CWaANw2f6kJU zZOgKzGXCo5`qw`v=h0-K0S%#1*~&`CWb$vP*A>aV-+TJ**DXgTF@>rc?=~{tzVqMp f+25HNR9-U7>J Date: Thu, 24 Aug 2023 16:07:52 -0300 Subject: [PATCH 21/43] Create mag-0.png --- .../Guns/Rifles/servicerifle.rsi/mag-0.png | Bin 0 -> 189 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..a3ea2ce8de562c8bdd6614be7c2569610f8252b0 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V34PaV@QPi+Y76C4;b*YJj`CWaANw2f6kJU zZOgKzGXCo5`qw`v=h0-K0S%#1*~&`CWb$vP*A>aV-+TJ**DXgTF@>rc?=~{tzVqMp f+25HNR9-U7>J Date: Thu, 24 Aug 2023 16:09:53 -0300 Subject: [PATCH 22/43] Delete mag-0.png --- .../Guns/Rifles/servicerifle.rsi/mag-0.png | Bin 189 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png deleted file mode 100644 index a3ea2ce8de562c8bdd6614be7c2569610f8252b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V34PaV@QPi+Y76C4;b*YJj`CWaANw2f6kJU zZOgKzGXCo5`qw`v=h0-K0S%#1*~&`CWb$vP*A>aV-+TJ**DXgTF@>rc?=~{tzVqMp f+25HNR9-U7>J Date: Thu, 24 Aug 2023 16:10:18 -0300 Subject: [PATCH 23/43] Create mag-0.png --- .../Guns/Rifles/servicerifle.rsi/mag-0.png | Bin 0 -> 189 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..a3ea2ce8de562c8bdd6614be7c2569610f8252b0 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V34PaV@QPi+Y76C4;b*YJj`CWaANw2f6kJU zZOgKzGXCo5`qw`v=h0-K0S%#1*~&`CWb$vP*A>aV-+TJ**DXgTF@>rc?=~{tzVqMp f+25HNR9-U7>J Date: Sat, 26 Aug 2023 14:37:01 -0300 Subject: [PATCH 24/43] Update antidote.png --- .../Specific/Medical/fallout2.rsi/antidote.png | Bin 3577 -> 683 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/fallout2.rsi/antidote.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/fallout2.rsi/antidote.png index 482df3347f41e948e82e45ee230db48b795513b7..bdfb07de8da7bdfc1a42a5de0ac8be8344c2256e 100644 GIT binary patch literal 683 zcmV;c0#yBpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zgSbK~z{r?Ug-D z6j2bz|0^p(g6zgy{K|SUK|Ts4ct%gO@(L|9RyJz1yq1no2}eb%i4>TaC<%5JCKg&i z1p)6P#6k(+N8m0>Tyl4cBJuE%dG~h3SjfD@v$vuQ za2v{Yb`_ZUs5jRRrP)w&N=)JxqJwq;rfuTNQQ)v^N?RB00^Vm!%KF`|2rKF5BA?Gs z3LzpS$z-yhd@9UBy8}PpCXW~H$5MBrM%tdd*QeZUv^>JXo^lqZu zYU@dF!DzKCF;_H3$1}KaJuc%d-NURoSskF{uZDVMak3A(L--b13CrOaHZV5qPJ7N6#`yeOQye?ZVyzMvG-D^AG&}z=5@1`PngX zYv6_&{UUK_ANrP-rF|wG!_~o&ZO^N93NFTWBihjv2qh=21G|9ca6LS)4hxILKtgsc z9Ot`?anb4kB|Q?haOv_7DP&J&)>V`TyMV&y4V;ebLVKqNFWVr6Z1Pcz3%dZju|{f2 z?Bm;hjDuDO2*+KOLi>R68firZ1U;AF5u1L8lpH5 zoB;n6_%SY89UvY&6oE{?{Dh}tUsQw#yMTndw?KLz)+&EI^cyBQJDNk=LQX!zf!_hc zfS51JB5sOC=_2Sh{O6a^<3xP@SX+Iq8UoAZHQ#y#FMUI)=g!DZHLUU%fK9^6;aX`r RJyQSx002ovPDHLkV1j?LG9v&0 literal 3577 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 From 5bffb5fe2313ecfbad433ec54eb0669a38527645 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Sat, 26 Aug 2023 18:43:31 -0300 Subject: [PATCH 25/43] Update tags.yml --- Resources/Prototypes/Nuclear14/tags.yml | 64 ++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/tags.yml b/Resources/Prototypes/Nuclear14/tags.yml index 8823acf780b..2ce13021c9a 100644 --- a/Resources/Prototypes/Nuclear14/tags.yml +++ b/Resources/Prototypes/Nuclear14/tags.yml @@ -4,4 +4,66 @@ id: JunkItem - type: Tag - id: JunkPile \ No newline at end of file + id: JunkPile + +# Ammo tags(cartriges). +- type: Tag + id: N14CartridgePistol9 + +- type: Tag + id: N14CartridgePistol10 + +- type: Tag + id: N14CartridgePistol45 + +- type: Tag + id: N14CartridgePistol12.7 + +- type: Tag + id: N14Cartridge44Magnum + +- type: Tag + id: N14Cartridge5.56Rifle + +- type: Tag + id: N14Cartridge7.62Rifle + +- type: Tag + id: N14ShellShotgun12 + +- type: Tag + id: N14ShellShotgun20 + +- type: Tag + id: N14Cartridge308Rifle + +# Ammo tags(Magazines). +- type: Tag + id: N14MagazinePistol9mm + +- type: Tag + id: N14MagazinePistol10mm + +- type: Tag + id: N14MagazinePistol45 + +- type: Tag + id: N14MagazinePistol12mm + +- type: Tag + id: N14MagazineSMG10mm + +- type: Tag + id: N14MagazineSMG12mm + +- type: Tag + id: Magazine5.56Rifle + +- type: Tag + id: Magazine7.62Rifle + +- type: Tag + id: N14MagazineShotgun12 + +- type: Tag + id: N14MagazineShotgun20 From 90460af0313a60301a9963808fffbc702489e8b5 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sun, 27 Aug 2023 22:09:37 +0100 Subject: [PATCH 26/43] Update 50.yml Remove high velocity --- .../Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml index f8b4e1e3f06..f437230d0cf 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml @@ -1,6 +1,6 @@ - type: entity noSpawn: true - parent: BaseBulletHighVelocity + parent: BaseBullet id: N14Bullet50 name: bullet (.50 anti-materiel) components: From c93b207cab5ce18f327c83ee6944278686acdc98 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Sun, 27 Aug 2023 21:06:47 -0300 Subject: [PATCH 27/43] more fixes --- .../Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 4 ---- Resources/Prototypes/Nuclear14/tags.yml | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index f40ab1294cb..09f81b7e262 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -11,7 +11,6 @@ - type: Gun fireRate: 8 - type: BallisticAmmoProvider - autoCycle: false whitelist: tags: - N14ShellShotgun12 @@ -29,7 +28,6 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi - type: BallisticAmmoProvider - autoCycle: false whitelist: tags: - N14ShellShotgun12 @@ -96,7 +94,6 @@ - type: Gun fireRate: 6 - type: BallisticAmmoProvider - autoCycle: false whitelist: tags: - N14ShellShotgun20 @@ -114,7 +111,6 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi - type: BallisticAmmoProvider - autoCycle: false whitelist: tags: - N14ShellShotgun20 diff --git a/Resources/Prototypes/Nuclear14/tags.yml b/Resources/Prototypes/Nuclear14/tags.yml index 2ce13021c9a..bc45a1d5cfc 100644 --- a/Resources/Prototypes/Nuclear14/tags.yml +++ b/Resources/Prototypes/Nuclear14/tags.yml @@ -7,6 +7,9 @@ id: JunkPile # Ammo tags(cartriges). +- type: Tag + id: N14CartridgePistol22 + - type: Tag id: N14CartridgePistol9 @@ -38,6 +41,9 @@ id: N14Cartridge308Rifle # Ammo tags(Magazines). +- type: Tag + id: N14MagazinePistol22lr + - type: Tag id: N14MagazinePistol9mm @@ -59,6 +65,9 @@ - type: Tag id: Magazine5.56Rifle +- type: Tag + id: LongMagazine5.56Rifle + - type: Tag id: Magazine7.62Rifle From f587ea5893fe08f2c9d5e2e6574d904aadf17da0 Mon Sep 17 00:00:00 2001 From: Cheackraze <71046427+Cheackraze@users.noreply.github.com> Date: Sun, 27 Aug 2023 20:27:41 -0400 Subject: [PATCH 28/43] fix linter --- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 4 ---- .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 2bab5a999ba..0b87c7e26b8 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -186,7 +186,3 @@ whitelist: tags: - N14CartridgePistol10 - fireRate: 5 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/mk58.ogg - diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 0ff94a0c547..904cfc9f73c 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -105,7 +105,7 @@ - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - selectedMode: FullAuto + selectedMode: FullAuto availableModes: - FullAuto - SemiAuto @@ -152,7 +152,7 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg fireRate: 5 - selectedMode: SemiAuto + selectedMode: SemiAuto availableModes: - SemiAuto - type: ItemSlots @@ -195,10 +195,10 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi - type: Gun + fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - fireRate: 4 - selectedMode: SemiAuto + selectedMode: SemiAuto availableModes: - SemiAuto - type: ItemSlots From e2befe57a5ae018c4e29958a4684489ecc1b2aef Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 00:44:10 -0300 Subject: [PATCH 29/43] melee weapons blind PR, wanted to add the power fist and thermal lance but without testing i cant really do anything. added 3 long blades, 2 heavy axes and the super sledge --- .../Entities/Objects/Weapons/Melee/axes.yml | 73 ++++++++++++++++++ .../Entities/Objects/Weapons/Melee/hammer.yml | 32 +++++++- .../Objects/Weapons/Melee/longblades.yml | 72 +++++++++++++++++ .../Melee/axe.rsi/equipped-BACKPACK.png | Bin 0 -> 426 bytes .../Objects/Weapons/Melee/axe.rsi/icon.png | Bin 0 -> 475 bytes .../Weapons/Melee/axe.rsi/inhand-left.png | Bin 0 -> 525 bytes .../Weapons/Melee/axe.rsi/inhand-right.png | Bin 0 -> 536 bytes .../Objects/Weapons/Melee/axe.rsi/meta.json | 34 ++++++++ .../Melee/axe.rsi/wielded-inhand-left.png | Bin 0 -> 481 bytes .../Melee/axe.rsi/wielded-inhand-right.png | Bin 0 -> 477 bytes .../Melee/fireaxe.rsi/equipped-BACKPACK.png | Bin 0 -> 494 bytes .../Weapons/Melee/fireaxe.rsi/icon.png | Bin 0 -> 500 bytes .../Weapons/Melee/fireaxe.rsi/inhand-left.png | Bin 0 -> 540 bytes .../Melee/fireaxe.rsi/inhand-right.png | Bin 0 -> 529 bytes .../Weapons/Melee/fireaxe.rsi/meta.json | 34 ++++++++ .../Melee/fireaxe.rsi/wielded-inhand-left.png | Bin 0 -> 906 bytes .../fireaxe.rsi/wielded-inhand-right.png | Bin 0 -> 913 bytes .../Objects/Weapons/Melee/ripper.rsi/icon.png | Bin 0 -> 699 bytes .../Weapons/Melee/ripper.rsi/inhand-left.png | Bin 0 -> 448 bytes .../Weapons/Melee/ripper.rsi/inhand-right.png | Bin 0 -> 447 bytes .../Weapons/Melee/ripper.rsi/meta.json | 22 ++++++ .../Melee/scrapmachete.rsi/inhand-left.png | Bin 0 -> 430 bytes .../Melee/scrapmachete.rsi/inhand-right.png | Bin 0 -> 423 bytes .../scrapmachete.rsi/makeshift machete.png | Bin 0 -> 465 bytes .../Weapons/Melee/scrapmachete.rsi/meta.json | 22 ++++++ .../supersledge.rsi/equipped-BACKPACK.png | Bin 0 -> 544 bytes .../Weapons/Melee/supersledge.rsi/icon.png | Bin 0 -> 714 bytes .../Melee/supersledge.rsi/inhand-left.png | Bin 0 -> 684 bytes .../Melee/supersledge.rsi/inhand-right.png | Bin 0 -> 676 bytes .../Weapons/Melee/supersledge.rsi/meta.json | 34 ++++++++ .../supersledge.rsi/wielded-inhand-left.png | Bin 0 -> 807 bytes .../supersledge.rsi/wielded-inhand-right.png | Bin 0 -> 793 bytes .../Melee/tribalmachete.rsi/inhand-left.png | Bin 0 -> 424 bytes .../Melee/tribalmachete.rsi/inhand-right.png | Bin 0 -> 409 bytes .../Weapons/Melee/tribalmachete.rsi/meta.json | 22 ++++++ .../tribalmachete.rsi/tribal machete.png | Bin 0 -> 422 bytes 36 files changed, 343 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/makeshift machete.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/icon.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/tribal machete.png diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml index 546f3f19a0f..fd79b8fa1a6 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml @@ -20,3 +20,76 @@ Piercing: 5 - type: Item sprite: Nuclear14/Objects/Weapons/Melee/hatchet.rsi + +- type: entity + name: fireaxe + parent: BaseItem + id: N14FireAxe + description: Truly, the weapon of a madman. Who would think to fight fire with an axe? + components: + - type: Tag + tags: + - FireAxe + - type: Sharp + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/fireaxe.rsi + state: icon + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + # axes are kinda like sharp hammers, you know? + Blunt: 5 + Slash: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2 + Slash: 18 + - type: Item + size: 150 + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Melee/fireaxe.rsi + quickEquip: false + slots: + - back + - type: Tool + qualities: + - Prying + - type: TilePrying + advanced: true + +- type: entity + name: axe + parent: BaseItem + id: N14Axe + description: A heavy wood axe, classic tool and weapon. + components: + - type: Tag + tags: + - FireAxe + - type: Sharp + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/axe.rsi + state: icon + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + # axes are kinda like sharp hammers, you know? + Blunt: 5 + Slash: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2 + Slash: 18 + - type: Item + size: 150 + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Melee/axe.rsi + quickEquip: false + slots: + - back diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml index e90c64adbb9..ac306d54dd1 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml @@ -8,7 +8,6 @@ sprite: Nuclear14/Objects/Weapons/Melee/sledgehammer.rsi state: icon - type: MeleeWeapon - attackRate: 0.75 damage: types: Blunt: 5 @@ -26,4 +25,33 @@ qualities: - Crushing useSound: - path: /Audio/Items/eating_2.ogg # TODO: Crushing noise \ No newline at end of file + path: /Audio/Items/eating_2.ogg # TODO: Crushing noise + +- type: entity + name: super sledge hammer + parent: BaseItem + id: N14SuperSledgeHammer + description: A bigger, heavier and more destructive sledge hammer, you really need some strong arms to swing it. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/supersledge.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 35 + - type: Item + size: 150 + - type: Clothing + slots: + - back + - type: Tool + qualities: + - Crushing + useSound: + path: /Audio/Items/eating_2.ogg # TODO: Crushing noise diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index b096bc6f263..f9605cc7797 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -10,3 +10,75 @@ - type: Item size: 15 sprite: Nuclear14/Objects/Weapons/Melee/machete.rsi + +- type: entity + name: ripper + parent: BaseItem + id: N14ripper + description: A light one handed wield chainsaw, originally designed by the pre-war army sappers to clean selvatic and wooded paths, it also works well against meat. + components: + - type: Sharp + - type: Tag + tags: + - Machete + - type: Sprite + sprite: Objects/Weapons/Melee/machete.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 25 + soundHit: + path: /Audio/Weapons/chainsaw.ogg + - type: Item + size: 30 + sprite: Objects/Weapons/Melee/ripper.rsi + - type: DisarmMalus + +- type: entity + name: tribal machete + parent: BaseItem + id: N14TribalMachete + description: A tribal machet, made from the materials giben by the nature, this long blade has the perfect balance between a tool and a weapon. + components: + - type: Sharp + - type: Tag + tags: + - Machete + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 16 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: 15 + sprite: Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi + - type: DisarmMalus + +- type: entity + name: scrap machete + parent: BaseItem + id: N14ScrapMachete + description: A makeshift long blade machete, not the most sharp blade but it can still cut some meat. + components: + - type: Sharp + - type: Tag + tags: + - Machete + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 16 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: 15 + sprite: Nuclear14/Objects/Weapons/Melee/scraplmachete.rsi + - type: DisarmMalus \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..6303e6041daaaa5ef77274be917b057137954de7 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4fdWcjv*CsZ*T4OVs;d1d$^hHpo_I5%X>$i zpqmkIZdI^1wQhePTM=qD>)I)=ODhr{`-?f|u)K9UXTZ4H;9b9Q`yT(z>6|L}e{SP^ z!@`t#04o74IW zmq!2l^5lkW*wXkNtDmwzoMjukPfI&eR>VkV?fm*X_f8+(E%Na3v8eik^%vFc@7@0T zdCj_~FFzhUpH)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dPq~K~z{r?Ul<) z!$1^bv=%j0Dt3SXrG`R2wtyT56+=;HD!(IGVe zHgu7h46#;ArAKUB11?U z!LCvFbZv@SmP38LPPJ;4W{MhnS1y&=I1uKnaUO6=IRRe|YNZ0H_6u3H67blA<=9CeignmYl+wONJau5mt`Jb{fuY0(7ne*Qv`T8yl* RP&NPn002ovPDHLkV1itm$AbU> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..11c94b81a7ce6260e3be8d26d38cb7529ff50458 GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4U0To978JN-rm~peb_;S{X=(sqqFAM<3WXD zA}s9eg6)4qCI2p#`CQ&%QBqJQ<`NM2^1&OSpK|2|9t(Gte|I`pXD?8sYqIzIr&%rc zj9oxLrL45_Vq&p=chJtg5=`@b(#!Vz`DL)Z{QJq{GMA>^?ru3a-D?g5OMO+*o4Bc! z-yEkjY|GvKGUs~V^WWBHKbq%<7uVKB+$nXK(y%OZ)vk4CPyb$i_rb%;%+TacIB?5cbVV3LOL=?5t%JgXP!Jd=Rm;4yf91D!Wwn{R^Bo?~ zc=ex)S#56BwL=ezgS;8e@tvF09>)#71Fax8I N!PC{xWt~$(69A!P;Qasq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5dc8f3627f2aad9393b3340c7be32ade00f74aef GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4QoAJ978JN-rm~peb_;S{ln%yJ-&rUPIqJxoyym>qeI}QTxC&4R?*4WlS}XOw`^JZeb)DP zh0gCq1VP|xSyj=T$6EK;a+mJ7-gabh;+pvLar3SmeR9dlZ8}d^wX%lGi@6E03}-CT z;$+^uXN_ff%``{$?KA87-*^3Wzb*Z1bK;(rn{>E0ajZVNS4^e<_t&>RYh5?~I>r9# z?O$hA&qbF^c#Cvb++|Grbh$lzu8t7DWu>;pfr{+E%g;LJ{ycW($@I1@wI@~;&DhO$ z;=qLTxOso~D^1ahGdd9S!KqbArcdebuRpJz`Rf&1FW^7PT;!nV0s~K`^&2zWCH;H$ z#NXd$$!idM+Qxgb>mEHi(=c;Sz8}|vPiGj8CGPoP`TM~Vh8rG*g=q};k6Sp%9C5z0 z>g`&yDDeY#T$^?uPp>t-X?Fa(pnBB*-dq$g)t*YmHjT9AKISWxhyQSd8i Y9-jxX^CyS)0ArKE)78&qol`;+03t*0lmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json new file mode 100644 index 00000000000..accc7afacd8 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a785601623b32822b5ddf4638ac91a3150e2f675 GIT binary patch literal 481 zcmV<70UrK|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0d`45K~#8N?b^Rf z!$1_k@lz28!9@{EIw-if7hD<;5&w)J4*pRc^JloGi_qOg(4nD|i{M;&;VvezmmlR4 z+W7rING@se-n(A9yea?y0001h|7J(;6Ta^+^`VNQD0gj}mDRPY_bJcw)WQCq9`%FN zBXzCvX9buK9?fTJGJVTke;Qw=GihVHr+B{1I``Pfv%ZF-J?yoe17YrUvjQ$ zE3%z0v(7y>RnN)IhFJj@!-1N<%zE)VAT^DzN9ujPsJ8;7_&&1LWqk!?*1|BXeCIcr z@%*|-`)jTfD$2$c z5?eMCH_PPEB#%ao!fd0l*kruF8YI`wj}Mcvi+^_*WpT4i4%siLbCQHf1ONa48%wDl X9&^7rtU~Ji00000NkvXXu0mjf#bnau literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4d15892d37f2fc22038af4e9ce47a4f7c96bcad9 GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4MmINPH#Fj!}s{t%=34ft!!?X2a4Tr*u_=7wx9hR4skOc(wd+@8 z#bv$b%2!%#wR_I2?N3*I&+Yy{YaKw^V+-n#YIigrFrxOI%T$Vf%l!p^dE?ZcAJ+tG|qB%=Bk z{a32&ysP@|8ta84f0JJ*@>%?C;sy%jJ!Z;quwQZE$o#l4<()Cx=lT?tzmNKR(eekY zxYX|4J7Mkp+r^V-@0p)5vHrl#=MR^O#ZA^brx-6O;kQGUS2w>n P3UZC7tDnm{r-UW|*-p@M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..2d245210084be0d3621bf923bcbd05dce9cce5b2 GIT binary patch literal 494 zcmVBZ%Vm(SCtPB>>ea5Dk^(G`0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ`=oHL)VqK#7YpC9|j)q>qa;ttc@!6~s2= zQdV&Fa{-$S0FuZXA}MdeG5`Po{7FPXR7i>KlsyiDKoEro`B|kRoC`-28dG(-kM=2iwidwBpET(!87BzOg>gUh#fh;16W$hT1V2ia zA|NM%0{h-h8srGb|J&PRKad7+4m9w#Ec?(EtDd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef7f7e3fdc6db5aedc05b2f7c15904799792138 GIT binary patch literal 500 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0f|XOK~z{r?UheU z!eAW7f0iX$3u{ZBvq#--l=6 z*yf(O#|hyF{agg`k5_uNko zCJHDY>|2}k5hxd7k*~r)t_6& qvB-fd0P>l#x3gv8!?$z(J4C++L;H1qzt5cj0000!AIx; z?p@oqWkIqYYhNM(^Ora?Mdxq9{_NZyajU+IxSR01OSv$3INO|JdG>3yMGK~6JnRa zrf{SC@}U3-4k}KI3f_73G`PFKn`Wc#v>C4B*YWy0W=?`_5oVmv6XpG)IGcO{G@e+E^<6v>5fKp)5fKs54)XSYo3G43P+5e$vjaY| z2pj2d>nMWjqJ6dFH`d^H*#w_i1aBMA(PcTlDj~_T#b?u2Ytd2uDc@NHr|$47W^vEM zcXVenHNCzT07#PLTSs{vrIZp8(O>V=G*y?wcd4E1qod2>nnlR{7Hu}_a#4Jp7e8;8 zf6Ecr@RddIasrl%2iyu@HOJOw5jLF-U>0GCO&dP^oZA=MEW&m_O8$~f7UAEV0KhGa eKtx1DyXO;zZpkv`x;vi$0000d0l)Raz#w5VP?%)|G$$f&N%Pw>@Mtk01*)p5z$^!x&u0% zC(-AtFw`EO2p!LpyL4KXli{kA$zVT~g6l~zN&w(~60{T0^$SvJ#hb5XzqaJ z-~qP-*H)`moV>=3oS!wE5Bj$lHa-QSfi9o4H!?}&>sw)zRqjaiX7*T z001|)_updKxC4?9JOK0uLp7ef{r576h=_=Yh=_=Yc7>I9esT2-IMs__yJuiqJqX6- z@l`g;_Gq5_x#mRxx%UL{3ifhYTCX9DL96bZ8 zbIj)#92QNdwrks!- zr;B4q#hkaZE_w$C${gQ6`OdW%zBLO|IqjCX3Vsoi+?#PtJ|INE=|_;~mu387UlXPT z*tw`)uR5W`VbW7|Vv!5)BAtcpS=ZS1>P$Epv`uw#)ZNQ}W4D(+zgqhK4%^!~{5`wx zR-ga*w{HICYV#j=MIXp0GR#qCX((=CDCiSlI48(-z|x7q!kvTR`3n{sZN0SLNrv29 zJxgDC30`ScJi!{Tcy3W;lx?DvhBGtn~FHEv^(7>uG7x8`EBUhv_4yXb*Aj*jN>dy zn>$*YZUlt#R;{<4XYu@8vAo~i@6uvbZxckVcWq}|dc1AgUJhq3*`jvwO?M}raktJ7 zI`GonE@zp!t5{BCbSL|J)FD> zn-3-j9j{v|XBoH2EL}vp6 zvGXlEm-L>=o+8&TtbS_Ej5+fhcidPt+gfwM<0A2Fs~V2JySyDWvyV;=KfFWH^Nmw_ z`l*H-wdvXCwrt=0SXZ~>O_qb_L{Z=OagV~|?X9n0TeY9%k@d}q50}4s9_M-J(4+t6 zkA7}`cJb$|cVE9cN83#Nr0u{yRh)}+(t^_(VCk zZFr$C=K_^&!N2dMozLdBonGi$&%EO79!-H0)rVEW3wgO0=&j!Vdi5>4^XfbMvLg;0 z-gu(syT!aKhpttwyKqc(#a`drIa|(g9%j0>cP8`QmK;6vB?l9V>`&eZjGMT%<`i-sogp}p@+5XhOKceF7WRT6dwA-6!&pfX)=f$L* zxt-3lNYpAEp3rc+_V0pqg;%nUa(gnFoITdcS-W#fFK=JFkFDUQGdn!_u1qzKnsBsF zw^fnxis?T?(T0+-L5w)1KfdbhBf&=A-on;Dibd blF#gwZ?jY9%DVRfGZ%xWtDnm{r-UW|bo!T7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..65a944239455a6ea8e2b15548362fe4421f1efce GIT binary patch literal 913 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?O zr;B4q#hkaZ;yr=`WsdLPZ1&dbe*&-g!3FI)hD}XMOU2Jty)ay<(DFf5`r>UKomU4n zF|Kj(bed%Zu~WacQdG!(Zm6!Zx&oD*a^VClqQ;m*PEoP+U!%w-mvtx+f6Wn4L= z)hD`)b3=OC!pKP{E+!Z}d^YRzr;gevwnc%Pr=`woV5&AVFkPyzXT!MJz|~>zVaK9P zVK0On9%s}fDATheeszV=ez$pJ=AJ-;Zr}l-X^& z#B%zwhDOf?Uk;sE^sW26`-Zq#FWJ+6g=#KdSg@vEasIvb4dq{@PHcYZZzFLfMk7~$ znYyId6pfGNQwwz#{MLw{y(2#Oz|;0y+l00VhjxYipBiV~CvwB!Q!$U@YTcK2o`+d> z=$tNCrxS3@^+40TeRkgY@sIv(dC%Bs=3*Hc@1J!yujQ21gt>{%rRTl>WM-=`e{Iu! z%w$f!(pC0v&bI;^FZ3J8?SJLceck(sPOpjhemu%(ltR zbB#ByjnnVBXLIyJJmW6Trx!%MRW;bpxY%$t=x{FNfJ#IyTG4t{#uR9{^#*3 zHgorA#xg~DZVfp7sPK8_W9ffuW&SP6e(^ol{q!HxKf;ISu|!_~_Vq;n(UOPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0#HdrK~z{r?Ucc8 z5>XU}k4;;wpp6ztB+VFUpe8mkCelUY%7rGV?2Iqx&Nt|Som&^OFdA!28&FBpQkWDd zAT8C5`H%NZW?*KRnGSK&FS(h^%)od4bMJ*NnI*+y(NI%YuBhuwKmn~*i|46Sim&Bz z+2)*6*GQ4%kVA}t`M4a+qyv&1;$$+(_jFx13j$J1q#YPf4*6g(;DNbQCn8^hLZM(- z<@I`9J#i+I0^E{Au4x*@jN+DtgUkL^sU=wa>%pm8XY$~)M=m4-Avw0?sWczz#Yin&l;syF9@S~d}x!e z#8zo^dd}}nOD+WJ0OZTpRw$jl&Y#atN3{3l2W>pcb8^Uk4TqFixH&bs;JX8mKYRI< z<;_~pCYR(Q_mf-*wFyx~_u!1@NWQc8(Uu(eNe==QQ2V~iX^q}hTF%6H6CTu?p^^)} zz98*K0gz*Z%_sg)uQQ;f`5U|$e^&Pc%Yp9>K#p~94;wW6eZq18IXWRnGbmH5E|oTo z$6F8R&D(dhxVXUgMx%d64eajJ%-_JDQqX1a?10Go{Vv^GOR^XPQW@&i(6|<0l{b#s ze9uc7COw$=0yZ4dTIG$SE^TjraQ*SHa$xH~E|=ro{;jHe${|$K3(0LD`SaIL3>1MY zK4TfwV-u0%YAqxzw#spoGFqDS{T{^I^mcGMc|*! hDxG=qOa2c;e*v#ViGIIEvC9Ae002ovPDHLkV1iTnNH+ig literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2b53f220e876605e4becd93a1a3729b2aa5295e8 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4WXVcjv*CsZ*Lv+I_x0O@Nn(*J)c{8uZryK}vfs4GawxsrHj`8Lk9!cRX?D zEOW=uP|;JHWRBkcKk2uT|FhG@&IO(gZ2v!g6U|$fH@PW%7E5IwN1k=U$G?~7Z0C&2 z6ym#7QWa}&YjYI^~49Mcbgx4^{-sZ z4RRO=eCrS2dSk1No=#kh_ZvCS0^f$G-P?b&>16liJuT$5+iJMz^!_ugCqyP@yxz8?uvKy2|c1e3So@Im`-Z1Nc`~5{sG8hPgg&ebxsLQ0IsdM^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9478cb69ada1e044877679ce9e9c4d77c640d736 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4I!Q`jv*CsZ*LiTA9j#9_VKdmeMJ#RaaWd3 z3yYT;C09=R)bV`eP7^iSVZkjL8*^3tiLT5`Q%P=>CI;^1cbRC=Sb{QSj@VB>1rE)>Brd}l25DxnJ#=-b?Nu6AHKdH*B!dXc;mx* z{rtnbelTROI9?a7c#3ZWm+iF=$D9H-a78E{*;dN1>RjkT?=ug3TNSK-t~(U6cH_4H m5&xN+17|WbFerqc`^#jyf6=${qvDeq$+E$v}KEXFMbYG^_`bUSaOguL0 z`t!uB%6(e*bgWwDcbRwdJbYASzM>*o@x?xasaLdOCI<+<{<_mz=H8vxrw>0!zgc^} z|GQ^>e9-pWYp>h?jt@7w&gb#0YV*gc)`y;7Y`IK$mg^opb(BXKG&70WB)a@Z zakz!gUwP;1=KG#ot0%o@5RIR<^s*(xTy~Dj`xiY(t87y^c1k*X*12WHYxn}!JUW}> z6!04n z>-O4(-{+s^RN1|#p!WXnsrO1YOi_&Zu`M_DdTID!Pu_)@Qt_do*PH|Fo`&4}cxC#X z_5!0lCrdffTg}Z{X5U_})3!in`JwuIEOi(9uf5LRe!qUl_wCac-}gLv_weTb;e5P~ zOx*K#*|onO7BDE;>8-RVs-US~g+Nd3EV=wH&ixdt~?4@*lseOVjQ@xkrk)emmg zEV?=&6^s9KTn+Jm^>6Ejo%5789Qs_kz5973tFG3qwVe(x?g2eKf%!S#gY2D+D_?!G P0NLy5>gTe~DWM4fu|>Ru literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/makeshift machete.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/makeshift machete.png new file mode 100644 index 0000000000000000000000000000000000000000..5a6cc93d7c7f18a50b595f51e1da8941d99fe04d GIT binary patch literal 465 zcmV;?0WSWDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0cJ@=K~z{r?Uv6< zgisWR&nO1XM(>3CX&7Q0TDS?qh4c))f~%gWm9Nl42uTq^ix_6rE+&x3p{Yp1TgP;$ z)F!>hS%lx_s&Mc3^PKA+XlYpouIuvjFo%?mjbRuD_dKsOM56&v&KQFr2%s!PV*xU` zrfKPwVmj$a%1^nj>tNe9IF6I^kq4+EM@R!yl_O*U>c|n20CnYvZ~zfGA{0PWj?@l7 zAxCNjppqk%Cmfh2kGfqFIa29WZ0;TLySD+vVVInY$`LsoSAusQMjN221DHoL>k}b4vT}j1@?O86l>PkjkwlLCx(7zPhfDd3qAYt( zB}YmZ!VSlILzvy3f)-EVY%=Lsmc@PFCzB(Ei)HfX#f+@iW#n3bWzXcV(Nm*xINUtJtGDo1h^*xtHN%DxVHA^YQT=|6nSKLp?%)J&cdk3S`<00000NkvXX Hu0mjfBvZoh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/meta.json new file mode 100644 index 00000000000..2774e070d3a --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..fca9b88c963cb7eeff3675a3d8e79fc7626687db GIT binary patch literal 544 zcmV+*0^j|KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kug)K~#8N?b<&} z!$24Y@HY-_9V`V$DGs%R26RwVT#So@;3zn_i;Ew`Mcf?(KZJ1+6&ze#q=PsKDkUAd zxtx9EPF&iYiDz={^IOt}{&}Cvo22wkh=_;=TU%UEjp@45PrYz>u&=haHdAXJ)7ydG z+KEios^ZHa;D9|mwxm8)*L(U4^fnd3V-PSHt*2+}_x(47HwWzM?mo3ns}2B!HXmG8 zzYRZBaL%JkF$j9s=s@TwiZTVaJ_X9kwEai7qxTFkw7GsLIN}JOx9z>TP#}ELN#y1A zT~x2^IF18zXUcQI^WqdR;ZM)bgKpC9#a9xBp~9VMyfUF*m5nzYuo0~*gkN4+mD`(Z zsZ?vvslmwtiM`#OLc`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$)i)K~z{r<(9E) z6Hy$;zt@oDnpDuC(xMI_NU4pDxfF^H4(;J+TpWrH-NnVf!lAf`qv%lR;3AF^JBZ+- zq|vmY$Pv*N3+ZCL)Jv24JzP!@J zWH&(Yi}9H3f3Zp)JfeqXR>)YR3HDO}Er5;nqA#4b!JId-cz408304D%L_!n_1?@sC zj+)~fSvl$9(vr-8GQqY53T~RFxSCGk{l^@>mn;Nz9b@C?a4Hh=vJ%yU&?2XCer%K{ z1AcG{t}@{VpPrn+)=rtnfFGQKXR}!?I2@Jm!g^6_gnue-%I7RwK$Ra34B^b#@g}&+ zj5`fvvJvhM_os%R1g2iRJX3Y zoq9IV3b!l!*tAMr$LqNWslxk(lX^0sis`3Q?+Z@q`iBbs=IuM=^ZA~^N?iruhLesJ zgbI%KoEuK+7^tz@Y0o*~q_#!adej_y&wawDf3Ak>oOhCMKy|kd8cu2oN>#q|V;d(0 zCwVnM@Wnd|^3Q{U)7?HuI4M9M3ckBrh8_x{XnjTPur6OLa@GLl0n{b4_sd4Tet_KP w4fZ4FrzSu$nG~tZmre}sD>C7B{|5no0hc~w>pppy3;+NC07*qoM6N<$f(x5ZCIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f086350d966d3b99d72dde947b5ba2e83589bf99 GIT binary patch literal 684 zcmV;d0#p5oP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zpYcK~#8N?V8U@ z!$1(mr=A2WdQtiW8m#nW1q*_x*OC|TB0ht7^5j88!6y(ezJT#)-rH^WoL#ND%m4f9lP<2Vwded#0y(RS01z~;eDA00wlC}V zi4q|Y5J9~iU~wz((*W&El6e6DMDTtJYn6piVuT$(h`=vGe!!jp8#D+W$McxL_-+m7 zrzZ2XSXriGah^6dw+8+vHrQ6{f$r)z)cNRA^U*Qpr_mJv;Cya0PmeFJgrNL@e&~;J zCW8mY1z_-!w10H$D;V@ce?brgK@bE%5ClOGgv5bQTR6OCB$$}f2yl|~15xD()cIm9 z0te4^12`8}1Rl?GMkRugZ-U4hB3a6H18|mW3A`>^sN)k;i_o7w=iqfkP{*nB#X1eo z&S8oE<+NWBxL?1Ry!4|G!PqxUXC1WCgWEjel$-g9(Ch}RAp5{RH%i;$WX0D{yaq)GrrrxrmF1VIoo3(+qQ1El7B SQ#I580000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0y#-UK~#8N?V8U@ z!$1(mC!Pc=dQtiW8m#nW1q*_x*OC|TB0ht7^5j88!6y(ezJT*<+3)LQ6S6~sAP9mW2!anzj*r?noNl^+@a?TlC7#>V zz~U{-QU}K3Zo-h$dg8&hsb)V?tNEf1h~L@UH&T@etIJF6{EVqGfm@8H!UTv%i(5fA zfyd)$g5k8Df!LAJG0K}$bXqQ}vB_+f777KLHceVv-|!vtKk+r$mExTGhmGM3on2fS z{LjZ#yf2X6Sox9i=<8{pigyAw!0D!sREp<&KF<85;l~#tK9TSFIKp%P%>>t~jRmb< zzoVPV6*b>lRJ*rhy|TlEiSZ207Z)j)n{_>@Tp0lI_fOC2Q5Sdd02-hLnxL%{mjSy6 zhsNi}yVFY!&;)HxR}ch25ClOG1VIo4p?~lxE$ID$Fk*%RCdvDPLG2If@gi*kix0A9 zfY0ZcVVdBpKA;;x*9_?Ab4H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json new file mode 100644 index 00000000000..accc7afacd8 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..aa84196d636ae2d249fd7a0d9dcbe7cf36c52b52 GIT binary patch literal 807 zcmV+?1K9kDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=!8?K~#8N?V3+$ z6G0Tlr<#*i1VKA3Yhu^;gX!eWyq$UPWu}FGs{}z11VIo4K@bGt z|D#Ly>cRbcuKq}ribZwx`VDV>qjF_z)J-{#wrZTeaM8=lSAd6)9&4*cp-|ZH1<2>~ zzAyIN*)zTZ5d7_*&K!2R(L_uL=4GCCsssjbdzE(jBfA2;VO`}zXvNnCTmjC9 z!Ij|k6ZpaRoh!8TZ53S|!IP26p46X|ntb_;`lpj`e1YScnVEOmY7YD2IdiR`-H4zc zlCR8_)aud#*_cC7$oR=7-FtBI)s$dG`pl=_IfyCy7|9X#H zzC@1c0mtP=6EPu}7v~GSDqyhuab8aG zM;#kFq@GWVs~4}Qx_I*_-tsU-TT`sf<#O()N?Dc46>p3SawL-_``XRhP4~ABuu&ik z0{ZfKLG9??LN-o`O#n8qoNcPQVWg71ns$>O&_ l033uM2!bF8!oP`9KLAa%lpA)MerEsx002ovPDHLkV1h-5dXoSE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..778a1d151d607a05c0d59a04fc9af630c62d2ae6 GIT binary patch literal 793 zcmV+!1LpjRP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=IqFW$U}NAaL2;=z+A5xj^;@#3u)<2nApU<6Tw zl4#Nz3(}&cC>E2PDl6aYyk&Q@T{g?^TIlzK$LyQT&dhsnCOLdjgb+dqA%qY@$kt<< zX;b6&%^Oy+R5G5;g^QO4)_wB$k!2n=?N&?OxqC15{iVJ@xm@-HcK+Pi4HGc?^qKK& zDwRs=`^$vW6UQtu`2K2(?;n>18y>}=D#Za;V6HW<#!E*`k5af2?)kAMj=Uh_lez+7 zG389_&}=qziz+;?zxTW#m6@14rF~GZy);iY{&x_};zC<>SC_Sq&yf`E805ao{Hwpa zy5CLEeuD6igD)`!vE8%|pBBDq3)%$wUV^*c;iH@|6MnpT?9!$lKV(vu2_tZ zl`Jv%*REXFtsuUCTo$CB5&zF%;m`qf|G~q7b&-V5wGj>Yr~=@A@KyD z>QIAs?H%!`$XO64@rfk>0w<(s$XWT(qTYmGI!}|S<40p9K2ie0?iGSY@NYkSR7)#A zof80A8k_0$`(|XaU`+&VTyTr#r~P(kG4wr=yORhW zpa5@bul4hhz+uYrm#`o|XQjCvkN@<2Zo0iPS@FlGId=AUBCdaZ^X%-U z$CC={%NN`2i*bD(xL}{p?J(c}+fru$-2wy-F3bNfF4pC>3F20~l@oBbJ@}#JH!eLd zhHHN=F|L^P{`bA`+g)YsEx`|Wev_L2UamoJmqu6U+0zr>3+OECjy010(|vAX@m#fr zrOg-r&rxf!on?NqeM6a+O>66fC)O+**=BmS3v@drWcA43;RV_^;5CPsB1TpXrkR`JA3 zC(HCd$NBu!Vh!_~>u!ihEc^V?&Qn_9Wy(24g(_~Kc~5fYJx{ehb0|1&?v~uyp^T@p zRquQao%XaU@c7DLzo(|zjG>{aflaO9amDh-Kbr9zzI=3w=JHQk-^*S)o_D$b{p3FW zDc(Q-)jnJvb;$c+@6-z>zCx-R$4@`>^-_Jqm;Yt)y4Ta*pI3S%#Mf#bFMo8=`7$Zi zyBoZ}$#@GI-ZKF@00>gvUYS2*V{pZN=b5DzuWrrU{i52V+LQ6JiLBni?@Mk~GT!>} z{^xJG_cKDQbq^ex&zYclrS$FBzyc>}JDcv`&e<7jGrS5U??rGP8~M@WP*3 z^|i83mfUi$5PotYSo)KooMPfPJ_d#c5s{<(*B0zF&ECj#6=b)ktDnm{r-UW|>Eo&& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/meta.json new file mode 100644 index 00000000000..2774e070d3a --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/tribal machete.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/tribal machete.png new file mode 100644 index 0000000000000000000000000000000000000000..8e334a890f50235606523b5719fb3bdbf3df0fee GIT binary patch literal 422 zcmV;X0a^ZuP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Xs=VK~z{r?Up@m zgfI|B$4R$J0R;`(W<|vf5Cug_YHmQ!jW_~Fp!Yq3khTdlTO=tQeJi8Ozhb} zFV9bOeBDu!B+lf&QdN~`nnoZ5rhv0N&z=5UYP*0uj$<0fk%nO)&bgP4m3IIgFY;-c zyvf1E9l)sH9`?i-JInjN_xh}r6F8jsdF;OBK>Hf*j$H1pz;fgNxdDjY0Rtd{b41&D QbN~PV07*qoM6N<$f)rD${r~^~ literal 0 HcmV?d00001 From cb5d12c6c3e5cd19d0eb5ff1f03160977fd83454 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 00:54:07 -0300 Subject: [PATCH 30/43] Merge branch 'master' of https://github.com/PatoGrone/nuclear-14 --- .../Guns/Ammunition/Cartridges/10mm.yml | 2 +- .../Guns/Ammunition/Cartridges/12.7.yml | 3 +- .../Guns/Ammunition/Cartridges/22lr.yml | 2 +- .../Guns/Ammunition/Cartridges/308.yml | 2 +- .../Weapons/Guns/Ammunition/Cartridges/44.yml | 2 +- .../Guns/Ammunition/Cartridges/45..yml | 2 +- .../Guns/Ammunition/Cartridges/5.56.yml | 3 +- .../Guns/Ammunition/Cartridges/7.62.yml | 2 +- .../Guns/Ammunition/Cartridges/9mm.yml | 2 +- Resources/Prototypes/Nuclear14/tags.yml | 73 ++++++++++++++++++- 10 files changed, 83 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml index b3ca0ee3217..8fc9a04fa96 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14CartridgePistol10 \ No newline at end of file + - N14CartridgePistol10 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml index 5d568bd0b61..ea5a7d786ea 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml @@ -8,4 +8,5 @@ - type: Tag tags: - Cartridge - - N14CartridgePistol12.7 \ No newline at end of file + - N14CartridgePistol12.7 + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml index 9e758a8e101..8f8d1834387 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14CartridgePistol22 \ No newline at end of file + - N14CartridgePistol22 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml index eeef393b9f3..c1b3444aa39 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14Cartridge308Rifle \ No newline at end of file + - N14Cartridge308Rifle diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml index 27e8a258e1a..93010436ea9 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14Cartridge44Magnum \ No newline at end of file + - N14Cartridge44Magnum diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml index 8a74e84b7fd..f08ccf16d81 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14CartridgePistol45 \ No newline at end of file + - N14CartridgePistol45 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml index ca0d105472b..a3d67eda73b 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml @@ -8,4 +8,5 @@ - type: Tag tags: - Cartridge - - N14Cartridge5.56Rifle \ No newline at end of file + - N14Cartridge5.56Rifle + diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml index 6007aace440..e1812f81625 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14Cartridge7.62Rifle \ No newline at end of file + - N14Cartridge7.62Rifle diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml index d5289f0f1b8..51d4d7e31dd 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml @@ -8,4 +8,4 @@ - type: Tag tags: - Cartridge - - N14CartridgePistol9 \ No newline at end of file + - N14CartridgePistol9 diff --git a/Resources/Prototypes/Nuclear14/tags.yml b/Resources/Prototypes/Nuclear14/tags.yml index 0e7373c7a4c..d9d701fc805 100644 --- a/Resources/Prototypes/Nuclear14/tags.yml +++ b/Resources/Prototypes/Nuclear14/tags.yml @@ -87,4 +87,75 @@ id: Bighorner - type: Tag - id: Radstag \ No newline at end of file + id: Radstag + +# Ammo tags(cartriges). +- type: Tag + id: N14CartridgePistol22 + +- type: Tag + id: N14CartridgePistol9 + +- type: Tag + id: N14CartridgePistol10 + +- type: Tag + id: N14CartridgePistol45 + +- type: Tag + id: N14CartridgePistol12.7 + +- type: Tag + id: N14Cartridge44Magnum + +- type: Tag + id: N14Cartridge5.56Rifle + +- type: Tag + id: N14Cartridge7.62Rifle + +- type: Tag + id: N14ShellShotgun12 + +- type: Tag + id: N14ShellShotgun20 + +- type: Tag + id: N14Cartridge308Rifle + +# Ammo tags(Magazines). +- type: Tag + id: N14MagazinePistol22lr + +- type: Tag + id: N14MagazinePistol9mm + +- type: Tag + id: N14MagazinePistol10mm + +- type: Tag + id: N14MagazinePistol45 + +- type: Tag + id: N14MagazinePistol12mm + +- type: Tag + id: N14MagazineSMG10mm + +- type: Tag + id: N14MagazineSMG12mm + +- type: Tag + id: Magazine5.56Rifle + +- type: Tag + id: LongMagazine5.56Rifle + +- type: Tag + id: Magazine7.62Rifle + +- type: Tag + id: N14MagazineShotgun12 + +- type: Tag + id: N14MagazineShotgun20 From 2cd1200c8edc50a11163616f6decef67be1c818a Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:36:45 -0300 Subject: [PATCH 31/43] machete name change --- .../Entities/Objects/Weapons/Melee/longblades.yml | 10 +++++----- .../inhand-left.png | Bin .../inhand-right.png | Bin .../makeshift machete.png | Bin .../meta.json | 0 .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../tribal machete.png | Bin 9 files changed, 5 insertions(+), 5 deletions(-) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{scrapmachete.rsi => scrap_machete.rsi}/inhand-left.png (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{scrapmachete.rsi => scrap_machete.rsi}/inhand-right.png (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{scrapmachete.rsi => scrap_machete.rsi}/makeshift machete.png (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{scrapmachete.rsi => scrap_machete.rsi}/meta.json (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{tribalmachete.rsi => tribal_machete.rsi}/inhand-left.png (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{tribalmachete.rsi => tribal_machete.rsi}/inhand-right.png (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{tribalmachete.rsi => tribal_machete.rsi}/meta.json (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/{tribalmachete.rsi => tribal_machete.rsi}/tribal machete.png (100%) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index f9605cc7797..8d852a5e00e 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -46,7 +46,7 @@ tags: - Machete - type: Sprite - sprite: Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi + sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi state: icon - type: MeleeWeapon damage: @@ -56,7 +56,7 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: 15 - sprite: Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi + sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi - type: DisarmMalus - type: entity @@ -70,7 +70,7 @@ tags: - Machete - type: Sprite - sprite: Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi + sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi state: icon - type: MeleeWeapon damage: @@ -80,5 +80,5 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: 15 - sprite: Nuclear14/Objects/Weapons/Melee/scraplmachete.rsi - - type: DisarmMalus \ No newline at end of file + sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi + - type: DisarmMalus diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/inhand-left.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-left.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/inhand-right.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/inhand-right.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/makeshift machete.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/makeshift machete.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/makeshift machete.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/makeshift machete.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/meta.json similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrapmachete.rsi/meta.json rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/meta.json diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/inhand-left.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-left.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/inhand-right.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/inhand-right.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/meta.json similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/meta.json rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/meta.json diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/tribal machete.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/tribal machete.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalmachete.rsi/tribal machete.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/tribal machete.png From 695e084a1833f045b7a0eb37c809a91998a89fc9 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:39:07 -0300 Subject: [PATCH 32/43] machete change --- .../{makeshift machete.png => icon.png} | Bin .../{tribal machete.png => icon.png} | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/{makeshift machete.png => icon.png} (100%) rename Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/{tribal machete.png => icon.png} (100%) diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/makeshift machete.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/icon.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/makeshift machete.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi/icon.png diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/tribal machete.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/icon.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/tribal machete.png rename to Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi/icon.png From 52390b9ae71f4ea9047527741180a67c4fac461c Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:56:45 -0300 Subject: [PATCH 33/43] tiny error fix --- .../Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml | 2 +- .../Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 8d852a5e00e..934cf532f93 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -39,7 +39,7 @@ name: tribal machete parent: BaseItem id: N14TribalMachete - description: A tribal machet, made from the materials giben by the nature, this long blade has the perfect balance between a tool and a weapon. + description: A tribal machete, made from the materials giben by the nature, this long blade has the perfect balance between tool and weapon. components: - type: Sharp - type: Tag diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json index accc7afacd8..c184d0ae035 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/supersledge.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "spear" + "name": "icon" }, { "name": "inhand-left", From ec296b0df97751b6c2016fdb887f8a8724d4f19a Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 12:24:43 -0300 Subject: [PATCH 34/43] Update meta.json --- .../Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json index accc7afacd8..c184d0ae035 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/axe.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "spear" + "name": "icon" }, { "name": "inhand-left", From ae6c243ad76ccc4e0b4fa49ae469a7b8412cba0b Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Thu, 31 Aug 2023 12:28:59 -0300 Subject: [PATCH 35/43] Update meta.json --- .../Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/meta.json index accc7afacd8..c184d0ae035 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "spear" + "name": "icon" }, { "name": "inhand-left", From 7462b7d1e1a5272f9f5648aed9d36e26b71f9493 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:37:39 -0300 Subject: [PATCH 36/43] parented the axes --- .../Entities/Objects/Weapons/Melee/axes.yml | 23 ++----------------- .../Objects/Weapons/Melee/longblades.yml | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml index fd79b8fa1a6..4c57a44c570 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml @@ -23,32 +23,13 @@ - type: entity name: fireaxe - parent: BaseItem + parent: N14BaseAxe id: N14FireAxe description: Truly, the weapon of a madman. Who would think to fight fire with an axe? components: - - type: Tag - tags: - - FireAxe - - type: Sharp - type: Sprite sprite: Nuclear14/Objects/Weapons/Melee/fireaxe.rsi state: icon - - type: MeleeWeapon - attackRate: 0.75 - damage: - types: - # axes are kinda like sharp hammers, you know? - Blunt: 5 - Slash: 5 - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 2 - Slash: 18 - - type: Item - size: 150 - type: Clothing sprite: Nuclear14/Objects/Weapons/Melee/fireaxe.rsi quickEquip: false @@ -63,7 +44,7 @@ - type: entity name: axe parent: BaseItem - id: N14Axe + id: N14BaseAxe description: A heavy wood axe, classic tool and weapon. components: - type: Tag diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 934cf532f93..b3bb9902c52 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -22,7 +22,7 @@ tags: - Machete - type: Sprite - sprite: Objects/Weapons/Melee/machete.rsi + sprite: Objects/Weapons/Melee/ripper.rsi state: icon - type: MeleeWeapon damage: From 08d782f669f2d6589534b6ec4fc75fe0c4d720de Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:41:52 -0300 Subject: [PATCH 37/43] Update longblades.yml --- .../Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index b3bb9902c52..21fb2a7470d 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -32,7 +32,7 @@ path: /Audio/Weapons/chainsaw.ogg - type: Item size: 30 - sprite: Objects/Weapons/Melee/ripper.rsi + sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi - type: DisarmMalus - type: entity From 820af2a45dbdb5fbfd96e82dde916812c69ef529 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Sat, 2 Sep 2023 22:53:58 -0300 Subject: [PATCH 38/43] Update longblades.yml --- .../Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 21fb2a7470d..87863e6938e 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -22,7 +22,7 @@ tags: - Machete - type: Sprite - sprite: Objects/Weapons/Melee/ripper.rsi + sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi state: icon - type: MeleeWeapon damage: From 3fe3fb77aeabbce9574da8e5f9549e4b581baceb Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:18:04 +0100 Subject: [PATCH 39/43] Update hammer.yml fix parenting and attack speed --- .../Entities/Objects/Weapons/Melee/hammer.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml index ac306d54dd1..987cdb880b6 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml @@ -13,6 +13,7 @@ Blunt: 5 - type: Wieldable - type: IncreaseDamageOnWield + attackRate: 0.75 damage: types: Blunt: 20 @@ -29,7 +30,7 @@ - type: entity name: super sledge hammer - parent: BaseItem + parent: N14SledgeHammer id: N14SuperSledgeHammer description: A bigger, heavier and more destructive sledge hammer, you really need some strong arms to swing it. components: @@ -45,13 +46,3 @@ damage: types: Blunt: 35 - - type: Item - size: 150 - - type: Clothing - slots: - - back - - type: Tool - qualities: - - Crushing - useSound: - path: /Audio/Items/eating_2.ogg # TODO: Crushing noise From 74582d7c1c6ec6bfc9b5be566bce909b376aa55a Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:21:48 +0100 Subject: [PATCH 40/43] Update longblades.yml fix parenting / duplication --- .../Objects/Weapons/Melee/longblades.yml | 61 +++++++------------ 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 87863e6938e..00ecfee4893 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -10,41 +10,13 @@ - type: Item size: 15 sprite: Nuclear14/Objects/Weapons/Melee/machete.rsi - -- type: entity - name: ripper - parent: BaseItem - id: N14ripper - description: A light one handed wield chainsaw, originally designed by the pre-war army sappers to clean selvatic and wooded paths, it also works well against meat. - components: - - type: Sharp - - type: Tag - tags: - - Machete - - type: Sprite - sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi - state: icon - - type: MeleeWeapon - damage: - types: - Slash: 25 - soundHit: - path: /Audio/Weapons/chainsaw.ogg - - type: Item - size: 30 - sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi - - type: DisarmMalus - type: entity name: tribal machete - parent: BaseItem + parent: N14Machete id: N14TribalMachete description: A tribal machete, made from the materials giben by the nature, this long blade has the perfect balance between tool and weapon. components: - - type: Sharp - - type: Tag - tags: - - Machete - type: Sprite sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi state: icon @@ -54,21 +26,14 @@ Slash: 16 soundHit: path: /Audio/Weapons/bladeslice.ogg - - type: Item - size: 15 sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi - - type: DisarmMalus - type: entity name: scrap machete - parent: BaseItem + parent: N14Machete id: N14ScrapMachete description: A makeshift long blade machete, not the most sharp blade but it can still cut some meat. components: - - type: Sharp - - type: Tag - tags: - - Machete - type: Sprite sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi state: icon @@ -78,7 +43,23 @@ Slash: 16 soundHit: path: /Audio/Weapons/bladeslice.ogg - - type: Item - size: 15 sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi - - type: DisarmMalus + +- type: entity + name: ripper + parent: N14Machete + id: N14ripper + description: A light one handed wield chainsaw, originally designed by the pre-war army sappers to clean selvatic and wooded paths, it also works well against meat. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 25 + soundHit: + path: /Audio/Weapons/chainsaw.ogg + - type: Item + size: 30 + sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi From a512d4edb2fd6a12e9a21618d793f4503578f6c4 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:02:59 +0100 Subject: [PATCH 41/43] fix hammer lint --- .../Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml index 987cdb880b6..3914abcabe8 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml @@ -8,12 +8,12 @@ sprite: Nuclear14/Objects/Weapons/Melee/sledgehammer.rsi state: icon - type: MeleeWeapon + attackRate: 0.75 damage: types: Blunt: 5 - type: Wieldable - type: IncreaseDamageOnWield - attackRate: 0.75 damage: types: Blunt: 20 From 69130495a3afbbde19f9b2893b75046854653b20 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:04:21 +0100 Subject: [PATCH 42/43] fix longblades.yml lint --- .../Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 00ecfee4893..b34e49bc28d 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -26,7 +26,6 @@ Slash: 16 soundHit: path: /Audio/Weapons/bladeslice.ogg - sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi - type: entity name: scrap machete @@ -43,7 +42,6 @@ Slash: 16 soundHit: path: /Audio/Weapons/bladeslice.ogg - sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi - type: entity name: ripper From 4505931e3c10944a13e379ef8c60e16d42c46867 Mon Sep 17 00:00:00 2001 From: PatoGrone <134236674+PatoGrone@users.noreply.github.com> Date: Sun, 17 Dec 2023 20:47:26 -0300 Subject: [PATCH 43/43] little sprite changes and 1 new pistol with extra variant added the chinese pistol and his special variant the spy --- .../Objects/Weapons/Guns/Pistols/pistols.yml | 92 ++++++++++++++++++ .../Guns/Pistols/chinesepistol.rsi/base.png | Bin 0 -> 723 bytes .../Pistols/chinesepistol.rsi/bolt-open.png | Bin 0 -> 716 bytes .../Pistols/chinesepistol.rsi/inhand-left.png | Bin 0 -> 607 bytes .../chinesepistol.rsi/inhand-right.png | Bin 0 -> 637 bytes .../Guns/Pistols/chinesepistol.rsi/meta.json | 25 +++++ .../Weapons/Guns/Pistols/thespy.rsi/base.png | Bin 0 -> 792 bytes .../Guns/Pistols/thespy.rsi/bolt-open.png | Bin 0 -> 787 bytes .../Guns/Pistols/thespy.rsi/inhand-left.png | Bin 0 -> 766 bytes .../Guns/Pistols/thespy.rsi/inhand-right.png | Bin 0 -> 732 bytes .../Weapons/Guns/Pistols/thespy.rsi/meta.json | 25 +++++ .../Guns/Rifles/assaultcarbine.rsi/base.png | Bin 593 -> 564 bytes .../Rifles/assaultcarbine.rsi/bolt-open.png | Bin 550 -> 561 bytes .../Guns/Rifles/assaultcarbine.rsi/icon.png | Bin 642 -> 615 bytes .../Rifles/chineserifle.rsi/bolt-open.png | Bin 690 -> 690 bytes 15 files changed, 142 insertions(+) create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/bolt-open.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/meta.json create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/base.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/bolt-open.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-left.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/inhand-right.png create mode 100644 Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/meta.json diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index fff1abf14db..358ba567e4a 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -32,6 +32,10 @@ whitelist: tags: - N14CartridgePistol9 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto - type: entity name: 10mm Pistol @@ -67,6 +71,10 @@ whitelist: tags: - N14CartridgePistol10 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto - type: entity name: .45 handgun @@ -109,6 +117,10 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto - type: entity name: 12.7mm handgun @@ -151,6 +163,10 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto - type: entity name: 10mm pipe pistol @@ -186,3 +202,79 @@ whitelist: tags: - N14CartridgePistol10 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + +- type: entity + name: chinese pistol + parent: BaseWeaponPistol + id: N14WeaponPistolChinese + description: A elegant and long pistol with a internal magazine, chambered in 9 mm. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi + - type: Gun + fireRate: 5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol9 + priority: 1 + whitelist: + tags: + - N14CartridgePistol9 + - type: BallisticAmmoProvider + whitelist: + tags: + - N14CartridgePistol9 + capacity: 14 + proto: N14CartridgePistol9 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + +- type: entity + name: the spy + parent: BaseWeaponPistol + id: N14WeaponPistolSpy + description: A totally modified chinese pistol. with a integrated silencer, fully automatic conversion and a extended magazine this pistol was designed for brutal silent murder, chambered in 9 mm. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi + - type: Gun + fireRate: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + gun_chamber: + name: Chamber + startingItem: N14CartridgePistol9 + priority: 1 + whitelist: + tags: + - N14CartridgePistol9 + - type: BallisticAmmoProvider + whitelist: + tags: + - N14CartridgePistol9 + capacity: 24 + proto: N14CartridgePistol9 + - type: Gun + selectedMode: Fullauto + availableModes: + - Fullauto diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..1cea8b2011a77cebff1006b195488889d8ba2afc GIT binary patch literal 723 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 b7ZCXYDG62?_bk##00000NkvXXu0mjfqm|*b delta 474 zcmV<00VV#i1f~R#R)4!mL_t(oN9~qPio!q;MoR}05m7N9Sqg5%8+ZcG;Ay>uYj+WX z5*0)R?U}FW3NaJYl9agdfplVPzxwI4(w8sVgkfmxB{Le09`5rr?Wh9eo6V*nL0}vV z2F@T<$;u~_iE+src2wgpV-^mFLpq<&v|g`E9Y1zd0rK&9Oncc3FNn94g6y^9ypColYmd$FmJNN{$f$RF#9$7KnVcS~YN>h zS}p2yI((m(_IM4EjcJ$Ncz6t?{VU# znP)eq7XKC#Ii7FnwFIG=x$w|}yc|NjAV(1IAPoR=j8iDP$a%tYzu(i(Xu<(tVPuHx zK~brbB(Ybz@Gl$W_#c-oy`6tMTmg}Pf+n&>-@zw>;0hoJl-?NiJ?4Pu7f%{Arq&-? QSO5S307*qoM6N<$f^$~k82|tP diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/icon.png index f6f26d05e1a686c1b55734b43f4fdf1da43ae5ad..fe5b50df1fac9583f306927ed1963f106d853aa3 100644 GIT binary patch delta 541 zcmV+&0^!syhToUv)QzR;FcPVOAO@mc{-g=G#ZV3S>I|jD!{ANDt}!r7h0`WG@VWZ12x_Q z0$(f^lt?7hYOstN@WS`|y?PTYV?E#pKcCMi!Bd72199Qd%O!BalgVTxI20)ZfT=0T zMT1VyX0r_6?RJsikah+D!)*p|DwX1AoN>Sbjsu6Z3js~w|Nc|ao|v> z0WVx42fW|!Q-7sW;ppSQp{IY+fiIU!x?Zn*>&@qL^BFiEk30%IlgaqPTdfxFi>lBJ zpy5zwjKyM+4u=C-mc?rV@AZ1L*=)EJ(A}VRCPFug3BVC?I-N$n`Q7by5nY9rAb*$3(RRBfG^0c=b1@?7cDwd^ zz1EH%3fw4goNv?{a+>hM}O51cC*SReu5(NklRVtNiYtfe)wF>abWD*e* z7_-@|r-@(DJ-kw>7+&y*8nw%en1T6xo{q;O4F&^O*0&n93V-l&xlGsVl@^NyjmKlp zK(+UPz-O}=#bPn_)LU8&IN{svR_%C8TMxLwPp1<~@RXs&Kv+2Rb_wp`@pwEC914^H zIopt2H0Se~QmGWfH=9i$IOID6a+?91NF;a-I8qL97&zq1fWZ6xK7Sk+3*fC*i$|CU z1NSAstJSKNdVgic=yW;;=D21ts_npfngM6zSWD#HZkIBd48IqRMsekaGV!tmhr@wK zz|-k8-|hGC-EPNasMTt`4yva$0~8I1nq$o6a2w-Fw1|8( z8Zlgq_|?l2pziDS8aJL5xy;3gsM%~9%jME{^pNL^0>}AAy`g&(PIy?kmcUG-0jR(M z!w+zn(5VLlfY1pbNWA*%-f!?mjBAA!3HnNZWeAfg|WVQWS8dMywD0000P9k6nxeYFLbBBZjSxy9NIeyLg(DY~pTQ60 zg2VxCa3}{*rML$Z1+@u|P5nq>I)m48Ox!s2g9D#r?W|?#n;Gw}4gU@8cH0lae@8Tl zR;xvEg=Qtt>2&<@cuXPFKXWG(k=hguxM?RdM(dc+n(A^D+lgPXV*n*47 zJNq&i))joe_Hx|GK>$3}7{?D) z*bz4={xP1=)=Mi#QgIz7Nf2 zlTNtVY?fJ$+_(s%^7(uY^?Dr)!vM!|NS+5PcR^f^)tjc7xpKzJ1eVEr&mTjt*IPJ{ zZcE}CP!z?lR;wheR4SqTsVaf_>k97Q;oyXxTRj?$!nR{a-0QDg zVW2z+iCOp@d3p56fAy^Ezj^&4^J`e>0LpNGGgv2r=>oRn!nbohnB@Sg6#w7xiry=n uxQHcDY67fkMrm?JG>OvX3>23u2lx$UdR!7t$h}7Z0000r(%FGMN!b}^%ncN8L=jAK*Bnm4s=~#?3>Ld+JEi#hWlDFBCJ-cIb4_R zsYDz+xp!Lt%)X8Bcq~pDbn@5@5I$B5xS>q&b6_n@1f@NZ9w6MfuH)+EOEB^ZR83^$OUw!x-$cbdY+i|EHy%eU`i$-)T{?uJ6_1wQT;&-Nc z$-s#c5Ls@T|GwSav)