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 0000000000..65688e7c74 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png differ 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 0000000000..187c15586c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png differ 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 0000000000..60e1f98b75 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png new file mode 100644 index 0000000000..82fa1c1827 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/inhand-right.png differ 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 0000000000..c855740b08 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-1.png differ 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 0000000000..8f25e77a92 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-2.png differ 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 0000000000..cea681bb5a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-3.png differ 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 0000000000..c7e2b8b768 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/mag-unshaded-4.png differ 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 0000000000..a4dbb68c68 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/base.png differ 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 0000000000..86baf48355 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png new file mode 100644 index 0000000000..f68220fd41 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-left.png differ 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 0000000000..720381634b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/inhand-right.png differ 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 0000000000..58aff7356b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-1.png differ 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 0000000000..a24f9a2e54 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-2.png differ 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 0000000000..316a517200 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-3.png differ 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 0000000000..57884d0b9f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/mag-unshaded-4.png differ 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 0000000000..a692f9cb0d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png new file mode 100644 index 0000000000..5b78397566 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png new file mode 100644 index 0000000000..6402065c34 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png new file mode 100644 index 0000000000..ab6f5a18c6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png differ 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 0000000000..e3197414df Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png differ 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 0000000000..3b3147a113 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png differ 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 0000000000..60386d0f6f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png differ 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 0000000000..e9622144c9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png differ 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 0000000000..bec984dc16 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/icon.png differ 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 0000000000..08df9225d3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png new file mode 100644 index 0000000000..b161b19dda Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/predator.rsi/inhand-right.png differ 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 632252a489..55c6f53388 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png index 97ad5eccbe..a6921cf4b4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png index 792dbb707a..1f96cf1a2a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png differ 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 b60d27bd88..e581deae1a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png differ 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 b1c4a2855d..92bd185eb9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-left.png differ 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 4bbb47e4f0..7c18d23dec 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/inhand-right.png differ 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 116705eccd..6ca919c70e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/mag-0.png differ 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 e8c38e9e52..55ccbdbbe2 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/suppressor.png differ