diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index f021e28ed3..36519aa63d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -134,3 +134,32 @@ path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg soundInsert: path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + +- type: entity + name: pirate revolver + parent: RevolverBase + id: RevolverPirate + description: An odd, muzzle-loading revolver, favoured by pirate crews. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi + - type: Item + size: 24 + sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi + - type: RangedWeapon + - type: RevolverBarrel + fireRate: 1 + currentSelector: Single + allSelectors: + - Single + fillPrototype: CartridgePistol + caliber: Pistol + capacity: 5 + 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/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 068ecd6242..347215e65f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -256,3 +256,50 @@ - type: Appearance visuals: - type: BarrelBoltVisualizer + +- type: entity + name: flare gun + parent: LauncherBase + id: FlareGun + description: A compact, single-shot pistol that fires shotgun shells. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi + state: icon + - type: Item + size: 12 + sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi + - type: RangedWeapon + - type: BoltActionBarrel + caliber: Shotgun + currentSelector: Single + allSelectors: + - Single + fillPrototype: ShellShotgun + fireRate: 8.0 + capacity: 1 + minAngle: 25 + maxAngle: 70 + angleIncrease: 30 + angleDecay: 30 + ammoSpreadRatio: 0.85 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + soundBoltOpen: + path: /Audio/Weapons/Guns/Cock/shotgun_open.ogg + soundBoltClosed: + path: /Audio/Weapons/Guns/Cock/shotgun_close.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 0f5afbd765..8465e688dc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -83,3 +83,56 @@ - type: Appearance visuals: - type: BarrelBoltVisualizer + +- type: entity + name: flintlock pistol + parent: SniperBase + id: FlintlockPistol + description: A pirate's companion. Yarrr! + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi + - type: RangedWeapon + - type: BoltActionBarrel + caliber: AntiMaterial + capacity: 1 + fireRate: 1.0 + minAngle: 25 + maxAngle: 80 + angleIncrease: 20 + angleDecay: 15 + fillPrototype: CartridgeAntiMaterial + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer + - type: Item + icon: Objects/Weapons/Guns/Snipers/flintlock.rsi + + +- type: entity + name: musket + parent: SniperBase + id: Musket + description: This should've been in a museum long before you were born. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Snipers/musket.rsi + - type: RangedWeapon + - type: BoltActionBarrel + caliber: AntiMaterial + capacity: 1 + fireRate: 1.0 + minAngle: 15 + maxAngle: 60 + angleIncrease: 20 + angleDecay: 15 + fillPrototype: CartridgeAntiMaterial + soundInsert: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer + - type: Item + icon: Objects/Weapons/Guns/Snipers/musket.rsi diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png new file mode 100644 index 0000000000..daedbcc36a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-left.png new file mode 100644 index 0000000000..9ce97b27ac Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-right.png new file mode 100644 index 0000000000..8301553cd9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json new file mode 100644 index 0000000000..45810f27c8 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/b1d5664161441b32f599a986e4fb8393cfd87324/icons/obj/guns/projectile/artwork_revolver.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png new file mode 100644 index 0000000000..fe046b7d24 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-closed.png new file mode 100644 index 0000000000..d0e666067a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-open.png new file mode 100644 index 0000000000..7c08e619f1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png new file mode 100644 index 0000000000..5637f7d455 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/inhand-left.png new file mode 100644 index 0000000000..5ea2af9bc4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/inhand-right.png new file mode 100644 index 0000000000..99b0ba9f7c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json new file mode 100644 index 0000000000..77ebe0e6e7 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "base" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png new file mode 100644 index 0000000000..39ce4fe713 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png new file mode 100644 index 0000000000..d2b5dfe7ae Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png new file mode 100644 index 0000000000..46f122e61a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png new file mode 100644 index 0000000000..0ea1fe4ed6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png new file mode 100644 index 0000000000..d78916e60e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png new file mode 100644 index 0000000000..c81fea4809 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json new file mode 100644 index 0000000000..494e6cc88a --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1a574ded496e5ebb5373a8221c2c563820fc137/icons/obj/guns/projectile/obrez_bolt.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "bolt-closed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png new file mode 100644 index 0000000000..bf84659ce6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png new file mode 100644 index 0000000000..ab9c5cdc91 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png new file mode 100644 index 0000000000..bcdc368171 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png new file mode 100644 index 0000000000..3b7198a32d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png new file mode 100644 index 0000000000..6c784dde9c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png new file mode 100644 index 0000000000..5a52cdc010 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json new file mode 100644 index 0000000000..608323e460 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "icon" + } + ] +} \ No newline at end of file