Reworks the Python to match the SS13 .357 (#18197)

* buffs the python to replicate /tg/ stats

* meta.json shits

* fuc

* fix attributions.yml

* yaml linter fix?

* fix fill

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"

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-magnum-name = Speedloader (.357 magnum)
-uplink-speedloader-magnu-desc = Revolver speedloader with 6 catridges. Compatible with Python.
+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!

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -81,7 +81,7 @@
   - type: StorageFill
     contents:
       - id: WeaponRevolverPython
-      - id: SpeedLoaderMagnum
+      - id: SpeedLoaderMagnum357
         amount: 2
 
 - type: entity

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 }
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon-357  }
-  productEntity: SpeedLoaderMagnum
+  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:

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
+          - CartridgeMagnum357
-          - SpeedLoaderMagnum
+          - SpeedLoaderMagnum357
-      proto: CartridgeMagnum
+      proto: CartridgeMagnum357
 
 - type: entity
   parent: BaseItem

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
+

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

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

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

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
 

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"
         }
     ]
 }