diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml index 4864ba4f82..66951e0eee 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml @@ -12,3 +12,8 @@ license: "CC0-1.0" copyright: "Grappling hook by 16bitstudios. Converted to .OGG and MONO by metalgearsloth" source: "https://freesound.org/people/16bitstudios/sounds/541975/" + +- files: ["revolver_357.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from /tg/station" + source: "https://github.com/tgstation/tgstation/pull/46689/commits/b9a455d6a07c800f14e385556b87815ef19727e9" \ No newline at end of file diff --git a/Resources/Audio/Weapons/Guns/Gunshots/revolver_357.ogg b/Resources/Audio/Weapons/Guns/Gunshots/revolver_357.ogg new file mode 100644 index 0000000000..fcd3b99ff8 Binary files /dev/null and b/Resources/Audio/Weapons/Guns/Gunshots/revolver_357.ogg differ diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 01bc1195b2..c9369347f2 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -1,12 +1,12 @@ # Weapons uplink-pistol-viper-name = Viper -uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). +uplink-pistol-viper-desc = A small, cheap, & easily concealable pistol. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). uplink-revolver-python-name = Python -uplink-revolver-python-desc = A loud and deadly revolver. Uses .45 Magnum. +uplink-revolver-python-desc = A brutally simple & effective Syndicate revolver. Very loud. Uses .357 magnum rounds. uplink-pistol-cobra-name = Cobra -uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (.25 caseless). +uplink-pistol-cobra-desc = A fairly underpowered pistol with a robust, inbuilt silencer, capable of making firing almost inaudible. Uses pistol magazines (.25 caseless). uplink-rifle-mosin-name = Surplus Rifle uplink-rifle-mosin-desc = A bolt action service rifle that has seen many wars. Not modern by any standard, hand loaded, and terrible recoil, but it is cheap. @@ -28,7 +28,7 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold # Explosives uplink-explosive-grenade-name = Explosive Grenade -uplink-explosive-grenade-desc = A simplistic grenade with a ten-second fuse that is geared towards injuring personnel. Causes minimal hull damage. +uplink-explosive-grenade-desc = A simplistic grenade with a three-and-a-half-second long fuse that is geared towards injuring personnel. Causes minimal hull damage. uplink-flash-grenade-name = Flashbang uplink-flash-grenade-desc = A standard-issue flashbang, capable of blinding and slowing down anyone without proper protection. This, of course, includes you; make sure you're properly equipped before using it. @@ -56,13 +56,13 @@ uplink-exploding-pen-desc = A class IV explosive device contained within a stand # Ammo uplink-pistol-magazine-name = Pistol Magazine (.35 auto) -uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with Viper. +uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with the Viper. uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) -uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with Cobra. +uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. -uplink-speedloader-magnum-name = Speedloader (.45 magnum) -uplink-speedloader-magnu-desc = Revolver speedloader with 6 catridges. Compatible with Python. +uplink-speedloader-magnum-name = Speedloader (.357 magnum) +uplink-speedloader-magnu-desc = Revolver speedloader with 7 catridges. Compatible with the Python. uplink-mosin-ammo-name = ammunition box (.30 rifle) uplink-mosin-ammo-desc = A box of cartridges for the surplus rifle. @@ -191,7 +191,7 @@ uplink-holy-hand-grenade-name = Holy Hand Grenade uplink-holy-hand-grenade-desc = O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy. uplink-revolver-cap-gun-fake-name = Fake Cap Gun -uplink-revolver-cap-gun-fake-desc = Fool your enemy! It can use both cap and magnum bullets. Comes loaded with magnum bullets. +uplink-revolver-cap-gun-fake-desc = Fool your enemy! It can use both cap and magnum bullets. Comes loaded with .357 magnum bullets. uplink-banana-peel-explosive-name = Explosive Banana Peel uplink-banana-peel-explosive-desc = They will burst into laughter when they slip on it! diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 7d8cc82c92..30a190ffe3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -81,7 +81,7 @@ - type: StorageFill contents: - id: WeaponRevolverPython - - id: SpeedLoaderMagnum + - id: SpeedLoaderMagnum357 amount: 2 - type: entity diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 734cca56e0..9d643eff4e 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -17,7 +17,7 @@ description: uplink-revolver-python-desc productEntity: WeaponRevolverPython cost: - Telecrystal: 4 + Telecrystal: 13 #Possibly too expensive, the ammo or gun may need to be cheapened later on if it proves to not be worth it. categories: - UplinkWeapons @@ -234,10 +234,10 @@ id: UplinkSpeedLoaderMagnum name: uplink-speedloader-magnum-name description: uplink-speedloader-magnu-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } - productEntity: SpeedLoaderMagnum + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon-357 } + productEntity: SpeedLoaderMagnum357 cost: - Telecrystal: 1 + Telecrystal: 4 categories: - UplinkAmmo @@ -815,7 +815,7 @@ description: uplink-revolver-cap-gun-fake-desc productEntity: RevolverCapGunFake cost: - Telecrystal: 6 + Telecrystal: 14 categories: - UplinkJob conditions: diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 26392094a4..038741944e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -577,6 +577,7 @@ components: - type: Sprite +#TODO make the sprite look like a python with a cap - type: entity parent: ToyGunBase id: RevolverCapGun @@ -593,10 +594,11 @@ heldPrefix: capgun - type: Gun selectedMode: SemiAuto + fireRate: 2.25 #same as python availableModes: - SemiAuto soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + path: /Audio/Weapons/Guns/Gunshots/revolver_357.ogg clumsyProof: true - type: RevolverAmmoProvider whitelist: @@ -617,6 +619,7 @@ parent: RevolverCapGun id: RevolverCapGunFake name: cap gun + suffix: Fake description: Looks almost like the real thing! Ages 8 and up. components: - type: RevolverAmmoProvider @@ -624,9 +627,9 @@ tags: - CartridgeCap - SpeedLoaderCap - - CartridgeMagnum - - SpeedLoaderMagnum - proto: CartridgeMagnum + - CartridgeMagnum357 + - SpeedLoaderMagnum357 + proto: CartridgeMagnum357 - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 757119ae25..a6618d7c7d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -1,3 +1,4 @@ +#.45 rounds - type: entity id: BaseCartridgeMagnum name: cartridge (.45 magnum) @@ -60,6 +61,20 @@ - type: CartridgeAmmo proto: BulletMagnumIncendiary +#.357 rounds (used in the syndicate Python revolver) +- type: entity + id: CartridgeMagnum357 + name: cartridge (.357 magnum) + parent: BaseCartridgeMagnum + components: + - type: Tag + tags: + - Cartridge + - CartridgeMagnum357 + - type: CartridgeAmmo + proto: BulletMagnum357 + +#C.H.I.M.P - type: entity id: BaseAnomalousCartridge parent: BaseCartridgeMagnum @@ -132,3 +147,4 @@ color: green - type: CartridgeAmmo proto: AnomalousParticleOmegaStrong + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 12d3e6972e..efe55278a4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -1,3 +1,4 @@ +#.45 rounds - type: entity id: BulletMagnum name: bullet (.45 magnum) @@ -54,3 +55,15 @@ damage: groups: Burn: 32 + +#.357 rounds (used in the syndicate Python revolver) +- type: entity + id: BulletMagnum357 + name: bullet (.357 magnum) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 54 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index 7b391f0516..6f7da4d9b4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -1,3 +1,4 @@ +#.45 rounds - type: entity id: BaseSpeedLoaderMagnum name: "speed loader (.45 magnum)" @@ -98,3 +99,28 @@ steps: 7 zeroVisible: false - type: Appearance + +#.357 rounds (used in the syndicate Python revolver) +- type: entity + id: SpeedLoaderMagnum357 + name: "speed loader (.357 magnum)" + parent: BaseSpeedLoaderMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnum357 + capacity: 7 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi + layers: + - state: base-357 + map: [ "enum.GunVisualLayers.Base" ] + - state: threefiftyseven-7 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: threefiftyseven + steps: 8 + zeroVisible: false + - type: Appearance + - type: Tag + tags: + - SpeedLoaderMagnum357 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index ada075b371..eb988ad1e3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -88,27 +88,50 @@ name: Mateba parent: BaseWeaponRevolver id: WeaponRevolverMateba - description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. + description: The iconic sidearm of the dreaded death squads. Uses .357 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Gun - fireRate: 2 + fireRate: 3 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg + params: + volume: 2.5 + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeMagnum357 + - SpeedLoaderMagnum357 + proto: CartridgeMagnum357 - type: entity name: Python parent: BaseWeaponRevolver id: WeaponRevolverPython - description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. + description: A suspicious revolver commonly used by Syndicate agents. Uses .357 magnum ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Revolvers/python.rsi - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/python.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 2.25 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver_357.ogg + params: + volume: 2.25 + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeMagnum357 + - SpeedLoaderMagnum357 + proto: CartridgeMagnum357 - type: entity name: pirate revolver diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 5a5d407dde..c0825c04ac 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -136,6 +136,9 @@ - type: Tag id: CartridgeMagnum +- type: Tag + id: CartridgeMagnum357 + - type: Tag id: CartridgePistol @@ -762,6 +765,9 @@ - type: Tag id: SpeedLoaderMagnum +- type: Tag + id: SpeedLoaderMagnum357 + - type: Tag id: SpeedLoaderPistol diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-357.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-357.png new file mode 100644 index 0000000000..33a6f85762 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-357.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon-357.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon-357.png new file mode 100644 index 0000000000..0a415bbef4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon-357.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json index 512c3ccb2a..1483f7988d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/b4424d7e79cadb258a65aec2e1bc16cf3d4021dc, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", "states": [ { "name": "base" @@ -84,6 +84,33 @@ }, { "name": "rubber-6" + }, + { + "name": "base-357" + }, + { + "name": "icon-357" + }, + { + "name": "threefiftyseven-1" + }, + { + "name": "threefiftyseven-2" + }, + { + "name": "threefiftyseven-3" + }, + { + "name": "threefiftyseven-4" + }, + { + "name": "threefiftyseven-5" + }, + { + "name": "threefiftyseven-6" + }, + { + "name": "threefiftyseven-7" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-1.png new file mode 100644 index 0000000000..d07f53a482 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-2.png new file mode 100644 index 0000000000..21dd3d78b9 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-3.png new file mode 100644 index 0000000000..f876e8c4fb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-4.png new file mode 100644 index 0000000000..73cc41a575 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-5.png new file mode 100644 index 0000000000..5d27da3336 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-6.png new file mode 100644 index 0000000000..b3520b26a2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-6.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-7.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-7.png new file mode 100644 index 0000000000..dead896b75 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-7.png differ