From e5bf2192cf6ae2c534450d382c91612d2635b014 Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Thu, 25 Nov 2021 14:37:21 -0800 Subject: [PATCH] New Guns (hopefully no conflicts this time) (#5105) * New Guns (hopefully conflict free) * solving conflicts * forgot to delete old laser gun png * Revert "forgot to delete old laser gun png" This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873. * small corrections * carbine * uplink correction * cog meta.json correction * replace laser pistol * svalinn inhands * getting rid of my old lasergun * forgot to delete the old lasergun from yml * Revert "getting rid of my old lasergun" This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2. * Revert "forgot to delete the old lasergun from yml" This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e. * base.png and taser fire cost corrections * last changes for this PR. the c20 and predator sprites. and corrected meta.json * lowercased Co-authored-by: and_a --- .../Catalog/Fills/Backpacks/duffelbag.yml | 30 ++++ .../Prototypes/Catalog/uplink_catalog.yml | 15 +- .../Weapons/Guns/Battery/battery_guns.yml | 140 +++++++++++++++++- .../Weapons/Guns/Revolvers/revolvers.yml | 32 +++- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- .../Weapons/Guns/Battery/cog.rsi/base.png | Bin 0 -> 562 bytes .../Weapons/Guns/Battery/cog.rsi/icon.png | Bin 0 -> 542 bytes .../Guns/Battery/cog.rsi/inhand-left.png | Bin 0 -> 555 bytes .../Guns/Battery/cog.rsi/inhand-right.png | Bin 0 -> 552 bytes .../Guns/Battery/cog.rsi/mag-unshaded-1.png | Bin 0 -> 149 bytes .../Guns/Battery/cog.rsi/mag-unshaded-2.png | Bin 0 -> 152 bytes .../Guns/Battery/cog.rsi/mag-unshaded-3.png | Bin 0 -> 166 bytes .../Guns/Battery/cog.rsi/mag-unshaded-4.png | Bin 0 -> 170 bytes .../Weapons/Guns/Battery/cog.rsi/meta.json | 37 +++++ .../Guns/Battery/makeshift.rsi/base.png | Bin 0 -> 446 bytes .../Guns/Battery/makeshift.rsi/icon.png | Bin 0 -> 458 bytes .../Battery/makeshift.rsi/inhand-left.png | Bin 0 -> 438 bytes .../Battery/makeshift.rsi/inhand-right.png | Bin 0 -> 431 bytes .../Battery/makeshift.rsi/mag-unshaded-1.png | Bin 0 -> 136 bytes .../Battery/makeshift.rsi/mag-unshaded-2.png | Bin 0 -> 151 bytes .../Battery/makeshift.rsi/mag-unshaded-3.png | Bin 0 -> 161 bytes .../Battery/makeshift.rsi/mag-unshaded-4.png | Bin 0 -> 161 bytes .../Guns/Battery/makeshift.rsi/meta.json | 37 +++++ .../Weapons/Guns/Battery/svalinn.rsi/base.png | Bin 0 -> 580 bytes .../Weapons/Guns/Battery/svalinn.rsi/icon.png | Bin 0 -> 588 bytes .../Guns/Battery/svalinn.rsi/inhand-left.png | Bin 0 -> 550 bytes .../Guns/Battery/svalinn.rsi/inhand-right.png | Bin 0 -> 517 bytes .../Battery/svalinn.rsi/mag-unshaded-1.png | Bin 0 -> 176 bytes .../Battery/svalinn.rsi/mag-unshaded-2.png | Bin 0 -> 170 bytes .../Battery/svalinn.rsi/mag-unshaded-3.png | Bin 0 -> 173 bytes .../Battery/svalinn.rsi/mag-unshaded-4.png | Bin 0 -> 174 bytes .../Guns/Battery/svalinn.rsi/meta.json | 37 +++++ .../Guns/Revolvers/predator.rsi/icon.png | Bin 0 -> 591 bytes .../Revolvers/predator.rsi/inhand-left.png | Bin 0 -> 540 bytes .../Revolvers/predator.rsi/inhand-right.png | Bin 0 -> 531 bytes .../Guns/Revolvers/predator.rsi/meta.json | 22 +++ .../Weapons/Guns/SMGs/c20r.rsi/base.png | Bin 2461 -> 530 bytes .../Guns/SMGs/c20r.rsi/bolt-closed.png | Bin 2516 -> 175 bytes .../Weapons/Guns/SMGs/c20r.rsi/bolt-open.png | Bin 2514 -> 158 bytes .../Weapons/Guns/SMGs/c20r.rsi/icon.png | Bin 2623 -> 560 bytes .../Guns/SMGs/c20r.rsi/inhand-left.png | Bin 715 -> 742 bytes .../Guns/SMGs/c20r.rsi/inhand-right.png | Bin 714 -> 711 bytes .../Weapons/Guns/SMGs/c20r.rsi/mag-0.png | Bin 189 -> 172 bytes .../Weapons/Guns/SMGs/c20r.rsi/meta.json | 2 +- .../Weapons/Guns/SMGs/c20r.rsi/suppressor.png | Bin 2457 -> 172 bytes 45 files changed, 345 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c77541d6a3..b62553236a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -54,6 +54,18 @@ amount: 2 # - id: SMGSuppressor +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateFilledRevolver + name: Predator bundle + description: "Go loud and proud with a fully loaded Magnum Predator, bundled with two speed loaders." + components: + - type: StorageFill + contents: + - id: RevolverPredator + - id: SLMagnum + amount: 2 + - type: entity parent: ClothingBackpackDuffelSyndicateAmmo id: ClothingBackpackDuffelSyndicateFilledLMG @@ -83,6 +95,24 @@ - type: Storage capacity: 200 +- type: entity + parent: ClothingBackpackDuffelSyndicateAmmo + id: ClothingBackpackDuffelSyndicateFilledCarbine + name: Z8 Bulldog bundle + description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities." + components: + - type: StorageFill + contents: + - id: RifleCarbine + - id: MagazineSRifle + amount: 2 + - id: GrenadeBlast + amount: 2 + - id: GrenadeFlash + amount: 2 + - id: GrenadeFrag + amount: 2 + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 970d8dfdcd..776635b834 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -9,11 +9,11 @@ price: 6 - type: uplinkListing - id: UplinkRevolverInspector + id: UplinkRevolverPredator category: Weapons - itemId: RevolverInspector - listingName: Inspector - description: A .40 magnum caliber revolver. Still quite deadly, despite its ancient design. + itemId: RevolverPredator + listingName: Predator + description: A loud and deadly revolver. Uses .40 Magnum. price: 8 # Inbuilt suppressor so it's sneaky + more expensive. @@ -137,6 +137,13 @@ price: 25 icon: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png +- type: uplinkListing + id: UplinkCarbineBundle + category: Bundles + itemId: ClothingBackpackDuffelSyndicateFilledCarbine + price: 35 + icon: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png + # Tools - type: uplinkListing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 4d370ca39a..3943ce4fa3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -28,6 +28,7 @@ fireRate: 2 powerCellPrototype: PowerCellSmallStandard powerCellRemovable: true + fireCost: 40 ammoPrototype: RedLaser soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser.ogg @@ -42,6 +43,141 @@ steps: 5 zeroVisible: true +- type: entity + name: makeshift laser gun + parent: BaseItem + id: MakeshiftLaser + description: Better pray it won't burn your hands off. + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Battery/makeshift.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Battery/makeshift.rsi + - type: RangedWeapon + - type: BatteryBarrel + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + powerCellPrototype: PowerCellSmallStandard + powerCellRemovable: true + fireCost: 40 + ammoPrototype: RedLaser + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundPowerCellInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundPowerCellEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + name: svalinn laser pistol + parent: BaseItem + id: LaserPistolSvalinn + description: A cheap and widely used laser pistol. + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Battery/svalinn.rsi + - type: RangedWeapon + - type: BatteryBarrel + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + powerCellPrototype: PowerCellSmallStandard + powerCellRemovable: true + fireCost: 20 + ammoPrototype: RedLaser + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundPowerCellInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundPowerCellEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + name: cog laser carbine + parent: BaseItem + id: LaserRifleCog + description: Favoured by Nanotrasen Security for being cheap and easy to use. + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Battery/cog.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Battery/cog.rsi + - type: RangedWeapon + - type: BatteryBarrel + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + powerCellPrototype: PowerCellSmallStandard + powerCellRemovable: true + fireCost: 10 + ammoPrototype: RedLaser + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundPowerCellInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + soundPowerCellEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 5 + zeroVisible: false + - type: entity name: laser cannon parent: BaseItem @@ -72,6 +208,7 @@ angleDecay: 45 powerCellPrototype: PowerCellSmallSuper powerCellRemovable: true + fireCost: 600 ammoPrototype: RedHeavyLaser soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg @@ -168,6 +305,7 @@ angleDecay: 15 powerCellPrototype: PowerCellSmallStandard powerCellRemovable: false + fireCost: 80 ammoPrototype: BulletTaser soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser.ogg @@ -186,7 +324,7 @@ name: laser gun parent: BaseItem id: LaserSecGun - description: Standard issued laser carbine for Nanotrasen security operatives. + description: A laser gun. components: - type: Sprite netsync: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index e8db31c29f..f021e28ed3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -55,7 +55,7 @@ name: Inspector parent: RevolverBase id: RevolverInspector - description: A high caliber revolver. Still quite deadly, despite its ancient design. + description: A detective's best friend. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi @@ -69,7 +69,7 @@ - Single fillPrototype: CartridgeMagnum caliber: Magnum - capacity: 7 + capacity: 6 soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg soundGunshot: @@ -106,3 +106,31 @@ path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg soundInsert: path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + +- type: entity + name: Predator + parent: RevolverBase + id: RevolverPredator + description: A robust revolver favoured by Syndicate agents. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Revolvers/predator.rsi + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Revolvers/predator.rsi + - type: RangedWeapon + - type: RevolverBarrel + currentSelector: Single + allSelectors: + - Single + fillPrototype: CartridgeMagnum + caliber: Magnum + capacity: 7 + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 691ab0bf61..b83355e82e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -127,7 +127,7 @@ name: Z8 Bulldog parent: RifleBase id: RifleCarbine - description: An older bullpup carbine model, made by Frozen Star. + description: An older bullpup carbine model, with an attached underbarrel grenade launcher. components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/carbine.rsi diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..65688e7c7481cf5ee936741c821a4605c1fc167b GIT binary patch literal 562 zcmV-20?qx2P)Px#1am@3R0s$N2z&@+hyVZq+(|@1R9J=WltF9MKorM+D~lo`E^#QWEN;U#CDMZt zr0l_ic#zhE?8U2iEFOf4-u)PU2QR&~-aL2+MQD0R7W z9?b9ZlF7XH|1)`SprWFpqT(M@E4%UG>f`u zuImA?^?uXX8%5#d9>^P-CRFBICN6Bp=z**uRS#H}P#=>dCQiocUD%Exp!Y&N?4KI- z9AP^IAGXXX2zIt>%~m_LEMW-e#wESC`UHTFoA2~Osj#lIbZe3DI4Q);XhvQfv@z@r zK2H)>=sl1xH0lk=dP$FE?uzw3yWv(-+uJT=Bi5*x7$XFALbz{!6+ z&kb0H3xBfM?{MZ-tRJ(m9S#rn{<^7(ii-b>A4CEGamYkb4FCWD07*qoM6N<$g6J0j AlK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..187c15586ceaa8c443d1e014ae2128573b8e745d GIT binary patch literal 542 zcmV+(0^$9MP)Px#1am@3R0s$N2z&@+hyVZq$Vo&&R9J=WR6R(;Kp1_IB8Zdm5QRz&ZAwa)iXaXS z)xp0(y0|(ybP_5$2<}eq&aN(Q>SPCpP!O{u##m87sKYhj;Cv4Cj$9ktD2ju5%Xfd@ z_a1leJ0M1k7%^h}F_fqW7nWBUA3KhX=coHG=Z57aq84!+8(WoaF<%@QV*7J>+*BWt zD^7I8-3uF6qeRMe9J`~gQka}(9jgGW>zYtnC@wJopbvKd0HW!bdZAcX264pRK8@q$ zJyGxEhyhDFA@_O>9&S;JPLZqjk=8O}MVr^VSTbAjX%c$I=b1 zEX`xHvV#Qmn`n4-DRC^D!5A_C0NXS}2}`ANC@B}}y5`5+5<pWps!GJB?^95}Ddt4eC4!(A=)+yt7|bD>4y$@5cY$?XQCb6ME0en;d&IoipAKpT4X+c08*paJr!~RK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..60e1f98b75923b5ee4cbe19b3b4b812c01f9efda GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|D0kJ<#WAE}&f8lX{SGzb;Cg*(Y znoim}iQkM#nfkOtI(YJI-xHQICUtRsJSBVN$KPX<;(q^chzZ1A}ID2iY;j!Nlx)lt$)r@wtWSKNo*KA#TolDMPc3eaMTfWAv zVn9zWxcg7|kIJ^2+zbuHSMT5C{&4Y)K*%#uhHvi#TpUk jT}2K{8$m(AzxnfLNWIY3+@;73jBo}|S3j3^P6cU zsreUKm4qg%tn}qL{jNBV!S!R*>#Jp<=8@A}1v`(;$XL7f=;Z%h9Y=Id?^~1jj3p-a z{*mX+!b>u_)|xtTTz$8JNj|>W#P?%OLDTBjv;Cca=r`1D7Ou|fdH6xjeYrS?qQd!N z)4ebBgeSh(8_tl>(+L!m;Cp{DIQh%$xih6gJ}$oh=E$>~hPyU4cGfd6^tdT+iPE)r ze&vgN`P{8$d~D1ro=glDQ_QNedXDc_FOmEG{;S4=w>Q3D`LXxMqm}u;L7w2cFoVU8O-of0gpz_|mZ)F__khNGZchma_3weXw*`Jw0?-T^Mmf1Wq{gT3MBEWaAIRQ~-QD!Q2~ls9XN6(fUyQ^U2Y#Q(LTvuA{AeC1`h zH>+2XMd#K2>8AN%iF3X5f8707EjfEmXvFQLYqxgPYZ(9io|;<~w(yI2!mMJyy*__V k{r!I5U^OVzxq^rd+_BQz}RN+boFyt=akR{026)rv;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c855740b089def3d898ae5425875822cfcf6f525 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf)elVy1O q<<&5)XFpl||D0W$czrWacS9YIJNNP>x3u2?ISihzelF{r5}E)4z%7*k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8f25e77a92eac9c95fdd571a73ec6e88a8f5846f GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#VfB;MO6`Aq>aqX!D>C_)pEPXm6mpNT|ImgTe~DWM4fX+|uw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..cea681bb5adf83e99a3e7bf7f9f6d4c608417b37 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#VfGPZ8pUpFD6 zc;<;x24-gF!(W;CCB**z?{e%1YT$A^r~%Q<1hhZ;qKtM;Ky@3?Yz9wPKbLh*2~7ar CDKKvU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e2b8b7684db4c2c04665c2c945b5dd1c752458 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#VfGB&TfQ$IEF zU9U0A*>t7rj66Vao!=%Q;>&;Suqv=NF1LdkU^4``8Ju4$E>b+L*aI}5!PC{xWt~$( F69BD)G2#FK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json new file mode 100644 index 0000000000..6f33ec7619 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/retro.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..a4dbb68c6820be93f8ca6851d1c103f3eaaadb88 GIT binary patch literal 446 zcmV;v0YUzWP)Px#1am@3R0s$N2z&@+hyVZqXh}ptR9J=WlR->&t=ywrR5XLI~ z2Od4|FxYSM_k^Vs1Sjm0;)F8krIa!cJJ*9GBu%z~;6?LXKAP|C`@Kn1AP@)y{yWj3 z#?{SzM-)TK0vDHrvfN@kK6mQ-MndVX4QlHK5Bm>1?e-C1{~4wsW7Me) zn3y4}N_qo0pTOKnW*9I=-Fmf*)~ltXuPPa-5Wb#oU12pDqi&ie`p8Y=Q$|0M;QnN0)aov7c5cPk;7cupa1{>07*qoM6N<$g0K?5r2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..86baf48355a143d6d584284d4e41b9b639d36af4 GIT binary patch literal 458 zcmV;*0X6=KP)Px#1am@3R0s$N2z&@+hyVZqbV)=(R9J=WlQB!fKp2MKKz~6gU2YK^@;L}q5K1FK zaP}XF9SU9iL(cvWp&Y#s5UjLAFQ8D6EFlD!&T)`CFS)A)!A0*`KJwk0_j~Vh0X!a$ z=f4x|S~xyAuZcoPnc-o0i1loPql*KpUZ$^5y47O-tsekO({YIafG9*94FLe_*$eLL zEpBETtJ2_02cRYjwO_&oMsb9M3mvjeBY+Z3Cu4AtVsLf}E>bLSuQ33y1gr`}H=T?d z=2B*eqhX_d8zA8V-F^>Tq>wVh^W&3#Ny-f7?$oo=C0tnML?O6Hb#>8cH`I`-D8WUF zswe>p8^c{X70RS4O6Sm>0lNL3J_XZI$_!Oe>VDf?>DnPBu=j#mO~$BJgQ}v$)%Fc{ z@7n-q{u!nrV^pgRn3y5+Tsi|-pTOKnVi+(+^=dH>R*Si%&vO~55Uw>>U(r}(jOtMw z=_5Cd_Zj^Z>jc^t>9+r;uumf=k2Y9{)Zhzj(;>aYE{^5F-bVv)m3(pr{@o8wN>ihzxyl_{KKna zGV_41&l@ehgNd9>Tb~%jXg25ExyJtN_s8=0_qXpU#}zbIYJg-l5`6)=r6t+gqAv^qU1O ze|paC)s`=xFD{df`oT4)n0c)tkBOeB;K@&i_V2Yj{qp9{4iD>=uZJg3dHpN;u9a?W zRjK0U=?f!ncXW7I?2ppBa&KkX$8A9CB@TUE{QFYKH1U7`E^RrRZMG-(M|i8Oy}-!Yy%qo a<)v)Hku#Rhb3YV;tn+mBb6Mw<&;$S-?7m3= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..720381634b95a3b2b1b2088715121c9d48417851 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|C>QDJ;uumf=k2Y9{)Zhzj(;={YE{^5F-bW4XlHSUx7VTj0fDwV_ooZ>KFC*C z$jQ|1utwCkAfm}Z*OFzY_l=0CU8Rdpe_uRn>E6BHqrO)w0c`++hLoRIGLz?;T}%CW zMRwP`T$8T_n|?V@^N)=T6FM&3`M7gR>ec*K+Y86q+G_b{w|z)vaGkX4XN9Dk)@iS} zdGhW`N?t1+YdCL3JkP#%tZllby#7*;OIzjK{w?wdnjRB-;*Bj={@>4!ef`d#J1o%V zBK^ANuaZ#PhKh=*C4ntV8(5 zZ1W#)-?6X%!M4whxu3u5ecQQu!{))mJW_t%CqGBEt%k6*!j U+Dp=Chbzc3Pgg&ebxsLQ01h0v_y7O^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..58aff7356b283c35eeb1b2ba81198f3923fe3d1d GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#VfSpkC^>bP0l+XkK8YC#@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..a24f9a2e544148bd29ec771408a8102dfc1f30cd GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf#GZBM7rc6nZ!(b0;OXk;vd$@?2>_6IE>{2m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..316a517200d47bffae35ec8b3447b3bb76dbdb18 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#VfL%IEF;DCMQU+E=~~XX`09<(HZzf%lO~_ugv@sCbA+D30rP_X?1z2$}*!P xu;lLn<~G;=`xjjRD-JZ^ayzI2))~Ofz`#05Y-%oVP!iBs22WQ%mvv4FO#m8-FERiC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..57884d0b9f8102219442b2db667188c857c1ef5c GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#VfL%IEF;DCMQU+E=~~XX`09<(HZzf%lO~_ugv@sCbA+D7cw`#?e7$%xquG?u~B)z4*}Q$iB}qUkOg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json new file mode 100644 index 0000000000..a9c1762fea --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/makeshift_carbine.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..a692f9cb0d187e3fd1900264cd5d61fdbb6e9a07 GIT binary patch literal 580 zcmV-K0=xZ*P)Px#1am@3R0s$N2z&@+hyVZq?ny*JR9J=WRXs}sK@fcr!Ai6-m_j)sA~q_1gfxPr zF#dx317a-vM}E{|6a*`6f?#tbMogOX2psD{IJhHV6ap5q7G~Gmy}iT_A_(`IS!Q=; z-n^Y`^_%daFLlL<-~C2PO<;CbKmgvOLp&7O+ydYDKhL;F$we&>AG0{}ceTD)%L zv)avXPylFHB((QDImM^@JFp!SzUv7DdS1cOvbxL52bXsP05geK%+6`TnTACKU&A8s z>4;FgF98**?Ke!MlDIW)c%rTR233)jeWk1Gkm5=LyWNEMcb?#HSOn?JCTzzH`DMsH z)fpv$Ud0)L-RCroHd`G)Dj@qxged1taP}(B667>Z_)MCu4y+gN$A1J@AgZ{Gs7`*0 zA-0IRqhR-g09T+yNCL;8^3xeKgdyy9%I~<@>I|HKQrfxEBq#Bk0gDmiU*H{U%o)dJ SVWLR@0000Px#1am@3R0s$N2z&@+hyVZq_DMuRR9J=WRXs}sK@fdWK`bl{S}2DiVx!_mOe2Ve z`U|eK5o6&G67mPcYbEo< zyqTS4fdmN>B=|$!}PRXd)=9NV@nsC0OW#r|j9w1$+H_xph3SSyn&t7e&Fg^X{n#+e{yn+y@OpCMqb_l$Fp#476HWDUMW{mDOd5@8Un7` zm8xu?S!Djy(r(cBQURivXbai8W0yO;%2NMmjL;9b!lYA8pGxQl7#T~)_Er36=R!XK z0Nmf(EU)re?Qg9U0I1n+Z0~V&oK5$4;CL27Ki~v(y@G{Bd6j2(KC1=*rcy7Mp3%57 zHQVL5n(ZPagIw}Y1;|i-Xklb5jgooE0&Q=t6PZ|%E1X}%IxZEk-wAko6L5UZb}^aR zgyUH;UWCZW&PWAxOHL83enZnpz0m}O1R_^(UFp1WWVhrrz=o!ApGm#Zg#8r!_>W*6 zP$d_ks^q8WqYKp?MXT=xSO*HOo5B%@_;h*=ZU{S-vOBIfnmrdFZSBl(nu++$fF(%q aFYpdVUlv{e*`(C~0000nkQ{TZsumtH&nV98a##~I8)nGRbe?uBrF#)w*yu-tA;^M)1;`Q#o8(jh=d&7RO{PBZ}QKI7C<}LCy zKi>blnO+|?<50Al3j%!6zVU=HM@M(PXq zNDxpsAfTXVo>0K8zrmVOHCI!)^|af`|2wC374w~4`-9)X1p-(WTzsLiIxPHuY&&1r z+I3RB=WfPrDl`v&Eg7?&lR<0$T?U31|NhM`$}eB> z{YFmW_J(k?i$+Booh|qdth(xaR{!~>|KEF`#vBqt3%^vnH zU-+zRd4>D$GvZ3QZ`5BlcOZb= zfu(<9r&qt#iIJ_gcG9p9j#-;-mE9$JBl5zlTZ|HQ5mlP?*A;hdUJ$&9kwvM9m0|J2 z13RYdzpn)pieAL{WvNNiY4!t8|NIpzwC3KWdhXBP?Fu{eA8;(}T6W<2Y3+NfM88zU z&Ux~l^XK!^Po~dpZC_k{TtU>D+w60>l9H0wN_p$P3*iYaDssT6WbkzLb6Mw<&;$UN C8RmHa literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e3197414df1c9c4a0503e1a1ce3bd2123b206a97 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vfi9;7>~+C`jZ+mn`P3Qe81>mxeQgd_Ky4s SDXpjefq0&-elF{r5}E+kQa#H6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b3147a11342531babcf57c2945215625e282592 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf^#G??3{yQ<1TF)P{N{jB9e zoD3f}AC%1f{OidIE!~%|3+G?E{-UQSI04R(LbCazGK$*+*Lph NgQu&X%Q~loCIAQiIi&yq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..60386d0f6f043dbf385864a251dc5865eda60ee5 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf}T+F^>bP0 Hl+XkKt;IL- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..e9622144c95ac82ff6cef2e7b210524a9fbbbad2 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf*QXYqad|j%Kv=PfNSS+JE)-`#K6GZs*%B~=AQwygTd3) K&t;ucLK6VOOE+i$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json new file mode 100644 index 0000000000..4b0057ab2c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/nt_svalinn.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bec984dc16738d0e529d3d65687c7992b6131bc5 GIT binary patch literal 591 zcmV-V0Px#1am@3R0s$N2z&@+hyVZq`AI}UR9J=Wl`%`hKp2MK6MsUXLx+?j&`I4|tGM(> z2nr6}6kHUYoSg)xV#TGRpx}>i5!jKmT`#@U3RV~MOug$R@B4k< zdo55E6osHxJKGJw{HGH2&1!!^8b|>c}yfj&Xc+$czqjy0>zDZ36%>8205sdl&0# z8#q6`z}5970HAwwr_PHYQfm=J>dYeX$KDG7%LpEOFW_$0w&v!R_2KQEMs81EPp0FA z1~Lr?-pFFW8@)21C6hEZ=0-0k_dqrpn!C-AjUvl3Xro zB~_|lJz#cYXgv>o9}1rt1{(Ej{`%b}5gqP2YA;D+gu=I8=|$v5K-HH^6%~}`=2k9b zGohBu0{b&^2Ii{#Z*!J^)iCA%xB>x0?U}002ovPDHLkV1kBN4D0{^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..08df9225d33db4d30752ebc872ef4d2eeb89b2fe GIT binary patch literal 540 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|D0j@$#WAE}&f8n|-iHH3SU*fw+A%FJ@`>X!hY8CV+m&RE*cH3@{O*d_`(&D{ zvrlg-+4ewTMTjfcT<(S4vwtwQybhSZ?W@0M%|@|v`PxsHez(ipe1};;5CSBh{aol$ z7<*|>=c8Q}bu(W1glSjWgjlX)aM+mQywX(Vq{h{sDw2*XO~1VVv?4D`PkaIoJ1fJZ zsW~h2rUc&AU~c&G{@mKibX)r=fA{J#I4rN7<6as3Ol->0CnvtkS6NuuFfh!SGwa*uz5-nPqj+Zqakd(*h@RW)pXwr>v0-9Jyi+Wz9V74bGR zkeQ+PKL3UH1si*jr#pm>mcER;TT^wgvQFdfYH6TjHID!N^7qZ>Y14{gey*E2e_wRg zY|FhFogD}ursplEz#S~f^!fBfp2`NDk~Rj8r$1jBetvf22kQ%)1FOC&?Y-R{bM3w3 zQZ?({k4>v4^^|-TYq%mDXb>YUbykcaA-!DMacSD0^#*x$zyEGm3wz77b~I3pC{4=YQUMefp8SZ9Ag9QVr&wyA~I(*^n!`But-q zhIo>o&9sM%2TFZ*^mR@?vb;y`eOS?-s2T0+nHX-()$3WacTZV$v0%57hOhX8-$%53 zr+?lY%y8i9Q`0}L5%U=I|NK2Htae^mCHQ6Pi=d^dUYAw->YG!v_SVekZr@!cl(Sml z@4E;ck*IhDq0WInM`+Y@)G56%cE#GZ#eJbZ%AN>)$Qm_&2k4MeDoozn`=8+^Oj~cH&lntZ@NH zVzeX3y!`#fT#mZW?7!Z3zGbqxV8Wt#h8;)GIL-T8uB4>YwNk(2+Yy61(lZQ!5zFA| L>gTe~DWM4f=XL7) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json new file mode 100644 index 0000000000..a81d2a81be --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/sky_driver.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png index 632252a48987844e6452acb6eaeb67e197929389..55c6f53388998880d668be0177794b0be41d0de9 100644 GIT binary patch delta 505 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 A$^ZZW delta 2507 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 T#Kc!P00000NkvXXu0mjffg7?I diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png index b60d27bd8831fdba3f7b332f368f78bf93b246f1..e581deae1ab6a56e42b2a204ab4d2470fdff517e 100644 GIT binary patch delta 536 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 Z@DG{+@K@aNk<|bI002ovPDHLkV1nef=>7lz diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png index b1c4a2855d0f6c39526ad7a2c02f939435910133..92bd185eb90999f130c9c7b337ba123fd007265e 100644 GIT binary patch delta 719 zcmV;=0xPx#1am@3R0s$N2z&@+hyVZrkV!;ARCt{2 z+OcaIQ5*;G?}b9zP25y4Ped{u93?i8ND?wQA3|H|AQ}1xbnev2zoR%<+CegB=nzUE z8j9dlg7nveMlwVkIu>4s^BtFH;@SIM>+t(*O7ipG@4d$j-+vz)HI5=-PPwW9zX@)(q?>l-uXb$a z|91EB{@V`#z|rOgxK2VMC%}2S4FDkWfS=#dv@81U;7jBkYuXjvy}6$GzW?NL&;%~* zCqSt@0AO!t3xADz4U{Wj-eMloy}1VE3b(%Ne?3PkodI_DLAe4}_6iVrAo6f}b^!oE z6PBuxE1*%Y1)o*X)~R#`O69S)v&H(n>{nni9)X4ftKS2NJl&|*%wlxEcd~HToN`s0 z#XIGy?)OeC8V)Q4XoBD1D0QMr>@5KJ*P+$!pi!?usee4ytwVj@{e17kJLRf2SE$wQ zK&d1pxQ?YrRZ_&VB;SZkQ&t+8yBPlCOSfcHs2vVkST}^9fNy)kKn4b0^J% zw%Q$*ls7y(U{d6`brX3DOva;NHURLCXx!v?{z&Y=2&!o7IBy>QD=;08OQkb9+=OMO zMD7aD4iI_4>;U&D9-D(XjpaB2QGQ1VA%qYjsz3eGC3TW&ixmI>002ovPDHLkV1gFS BPtpJY literal 715 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4CFV;uumf=k2WhU5^4Jj`~ll zY?z?uyQ6=D&Y`B(H^xh*IHu^bEB5yCCnPKLMDy_+HhOB)9Kq4l(O=*>S?>w&rq&uo z<#RJ$>@6-Ud%ynk{prQ$%l8VNf37>-`_K8BMDB#gJPCM+&ntO6)HWNIC9qK8qYHZzx%H{cXa9{)g;|uk(1_A7A1>6n_5Xqp4jF*cIjE z-`NUR^-3=&>#zeIav~&EX`wuakC1ug`P3 zyjcP0zQ{dq<{WRYUVp+kWA3AuKUuqfUh(+O=$+ocG5y^4U2|W3sq^16=L^GzsQmca z+CK^=y9y3&{=0sIj@N6E=DI&=>`OoUpVy!8UA!{w&F+6<*XlV$E8G6&H6N{cwRd~% z>-F!;XY)ted|n}B!3GOOn&N;)jWpCVUj=NPR zY0Brk)HZLDn>fGg&MdbV$9N44r3?C$&aYY#vo6$qC5Kc-%D$<_4`$tLDE0`kdvQE8 zM9+=kz@zK$H~F^YrP_fduB5Yvz1H30H}THhu(^5C3!_i6sR~Z>n{n#P>&?uYeq_In z+R1&wp!p4p@Z{Lzo0*G_oiMnzv~=yV!@lXvv#waqlQk$U-&n-)uc!VF!`XD^bA?%D o3+m=(7kp;SVa%C>O8jHED-js>dlK&*U?OGkboFyt=akR{07Y#^KL7v# diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png index 4bbb47e4f0e181739dcab6b5f1c35379232506d6..7c18d23decc109a045303ca014ba4e12154627a0 100644 GIT binary patch delta 688 zcmV;h0#E(Q1;+)DBYyw^b5ch_0Itp)=>Px#1am@3R0s$N2z&@+hyVZraY;l$RCt{2 z+OdinQ4|K?-;g5d#7+fsMI_b0uqX?zxT&lMA&rHk$g}tqDa67iAl4~U1Y$xEwh~#m zTC7+ozQIkg9vOAi(Y=Z;|JS**jYJYi&tnm_AbLe?*!~BxU zI7UA{L=Iopd3cGe`SS6DyfmGsLFl!<*><4r6pfe28kKPj0J!<`!QDLvfANj}5V*Tv zIbL^)JJ%i9fVxvO-RT56nTC6F3-{*M)_PB((I2AGAENjE-Nv!*bh5Jvfen!2Yt;%$ zg&Y7tsg$ktT7T7f8bow54cy%$8jGX%@At}aolK)UooqcnumMs$0Q~&*7g~>?^~mC~ z?JE^>P%4FJEDqVW08pz|pp)sX=WW~s-F(?d@y%8ny+1!909M}g(k#|!0AM~FLvGk| z-&)jTq!z!G2DtgMkxRYVYD1|M=CjK!+)s*g^JSwJ&3{lTg=VXbTD7v+!sU%7EMLec z-)yxZCu==IP}i=7e4w&@rM|5-1wHCMh5W8?4KDRjPDDgRL_|bHL_~CXUh98Ux2D5> z{=nq5+1mh##DcQHbH`<;_7`?rW} z18G9D)drph))p5ur(oNQli#%res}tM;QRXD6TnH5>d;$Yoys^yWgIh~jh8t*@Vqr% z`kf(oPGNkKr@+zCw|{Id8jBl$6Lw8x?BkzP&?$PfoKv{uF})2ot^iwWAtE9o+U7sH WzY}JdFDat{0000TPZ!6KiaBp*ZR~m!Aky}K_Z#Mxl1wMLM2Qwg?wjcwrZ}ePvMc&Z z$t(2sDnxS`=>(rMJ|V(-pbO*sa3GkaKPIp={SDToOF)D^smseBbqAOEg2@*?U~wKYb#%F`q9^ zym@XS%jvRzJ6nrcJw7sgsQ>n_QR7yc_nWYnTcT&O?0rzTp8Iqemwma)0sccF`uFOq zLN1?-n5wI)2Bd8F?@{X72DDe~^Gv3H^Z5V9ZU3MX@T-4O(X6stYu}uG-Fmt?U(%i< z_@qv>^ZIlv$@f<$a85A)|K}6e`QqaIfA=SB_IWk&*Oy(JbQMl#SV^uvTU9@G@6Y*n zTXnBu_1TNwD^(n%)aFkN zVr+l=d{6fEMV#}GY;LtTAz~lU_*O^y3+oY zx)DDG-fW4U@$c7MT}RFWOP$tb2A?sL$XWSAJR!Z>_6vL&fWXt$&t;ucLK6TK Cr9)o; diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png index 116705eccd2fa8fd98da66fe3890d50a8ca962b5..6ca919c70e109fe8824b875028c7050c63dcb0fd 100644 GIT binary patch delta 144 zcmdnXxQ20pNGZx^prw85kH?ik&<|IDnvrBc%h#5A$?!42fucdqI(}!GXu+ zqT)k8jzf-7*R3Zu96o5v!FgPZZD*PIk@~!>v>;BPdJTjAInzzgDrc8}UHW)q{@f)p v%N-|uI{S8}`@HLSp9ue#{}^f6a7*sIj9m6>_Jut_9h?lFu6{1-oD!MLf6Lwid)Bdr{OGX&aO(itB=c)<`7>A^5<&c^?AcL2;0 zCy!rXFt;?InIj0MfvgmNnmU50L(*omY$7Iw2qZ$qvXa@iQHRC3yNV^eO P00000NkvXXu0mjf@<2Va diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index e9768ab608..822a91dba7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png index e8c38e9e527a2ec23ebc02587d4a936bf721474b..55ccbdbbe23565d5c4638ffbadaa65b8c324617e 100644 GIT binary patch delta 145 zcmV;C0B--86RZJ{BYyw^b5ch_0Itp)=>Px#1am@3R0s$N2z&@+hyVZpR!KxbR9J=W z(Xk1DU<`!O2#yd)kwW%wJBSDX0Dm`il&oVvO#RMTA*L=_ zA#=w7Q~dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3 z{bvVPL>>$g}6?Rv5RnH_dJ;~qLWiT@6b%jKQ_1B*}{DF(8mXJkjX{AJ5 zx#dQNmm06@>Ql_8Jr~`dFn*$k#|Hw5(epJd>z;3*%liV&H-Ei9(}RwiPrVtX_#~QL zvcJz;$(s?=MNjuQw0nV-59ZttjhpS8Suf+PaK;qyV+yo5aXc+ulK6TIkDw(kn3%X8 zN<%ALKl?8{T=xwJKHgsZ7vD7FcXwQj-pnd5e!A&NUg-P~Lr)qddPt^^8o_*xAFmJo z+k4i%*JYh$#D7uCZgl=Fs(9q#0_tl(BWf_FW4!(F4r0n{c;?ICsyS|WISr<`W8 zw9`8MNCPTnTBPWS2JxX)R%$fZA;^BGO&Wm11R}%($T7(D&?OzY&E-K@h2)tqlMXgXYAUIuJ+_geJ74 z%-9J^m0UK~XgYIA=prM%00`m23TUuV09MYD3-((@2w4!8EFwizsx+~}B^N2BXz@H{ z%9>TQsDEnJrdGM;Dz#LtwYF-F8Y7KKXr*bZtu-?UwQS&Jm~S9->fCdeUb^<$TepGm z8F|PkLq{EL*rdr5DIm-;b=KLYt+WtID=%4P>8h(O+laNzJ8#)#>#n2J8l+V+5)Ie5!W05?ah+_uCC?_DUj(-3GnjEuOQ_kebIcBjD2WBB?DGts| zju;TkE0OH7}jf3WmW(yVrZk$amqhMXOXdP1OBuTwO zw?hmU6>mK=v?;46>`J(;mVv0Ni+`Yt!;gq*2)w~OV(FkRR9n<&Lk;gWg$9g@qlLoH z_aYQd{0BIZoJ6d{CD`qbO*QC>i26JXOQ_4mzO{w(_&CZ>cU6{wa1@VtGZ(O)J|~D? zWq2&1WTQxPZl-A3d!DuU+tOWn2jW_#P{u z$I-y&mAs+;HGj8ouWZ(){~z^4I>!AHf4uL(o_=SoPzEpdDGx{GGDUQO}&f#wyvTclN3Kf_zkhKq+wA3;5j~fgCyo#cT@c z2J76Dzc5r(SF&8EIf5jXkU|;)Bs5S(4JP8Ws-zgm(0;f{|kZbtn*R zKlmT~?$#(xO*%=T1mJ(MtdCJ3unV-Cmi2vXS?v?R_Y7RAU4MVQ1w3Xu9k0rgF|4fOxf!$ z?+*6%_V1Zae?KDca)+IJ)2;vj00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{ z0eGc9b^rhX2Y+-)O+^Rf1sVtn07AKPjQ{`v-bqA3R9M69mOn@WQ5?s=7fvk=f@ozu zT`U^191f?VHAHM^E(j!-XlM|mEP}>rDFmafC|cU0$t@xbhXg~=!#^lT$8iv@HN<R zb!MoP>VI$(FBdGw=6q@SIS*#m0zy0(br0%vbZz5<&o3_E>ih;kj#WSm8VBM78reSl ze6&PWUv)M~Dzj0T9G`{VF#tu@;0sI{X7o}mL6J4s9RmOWMb>oRQ2mH^2$fR3ZG0*` zymfU8s!|ir*;Dk}U1%u{on!uh?riP1IigTT62Ud0#k^sgb`1qu(=)8?d|G6U=*0j;c=2V8u1RX%p)NY*?bKE5L*eeUYqUhcn!OG z71K)4R?tJM$Qo-`r$l-N;7iK4#H@9{0$|kJUW0!Nz