Revolver / Python changes. (#18352)

Resources/Audio/Weapons/Guns/Gunshots/attributions.yml

@@ -12,8 +12,3 @@
   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, cheap, & easily concealable pistol. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto).
+uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto).
 
 uplink-revolver-python-name = Python
-uplink-revolver-python-desc = A brutally simple & effective Syndicate revolver. Very loud. Uses .357 magnum rounds.
+uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum.
 
 uplink-pistol-cobra-name = Cobra
-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-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. 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 three-and-a-half-second long fuse that is geared towards injuring personnel. Causes minimal hull damage.
+uplink-explosive-grenade-desc = A simplistic grenade with a ten-second 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.
@@ -61,8 +61,8 @@ uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with
 uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless)
 uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra.
 
-uplink-speedloader-magnum-name = Speedloader (.357 magnum)
-uplink-speedloader-magnu-desc = Revolver speedloader with 7 catridges. Compatible with the Python.
+uplink-speedloader-magnum-name = Speedloader (.45 magnum AP)
+uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. 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 .357 magnum bullets.
+uplink-revolver-cap-gun-fake-desc = Fool your enemy! It can use both cap and magnum bullets. Comes loaded with 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

@@ -80,8 +80,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRevolverPython
-      - id: SpeedLoaderMagnum357
+      - id: WeaponRevolverPythonAP
+      - id: SpeedLoaderMagnumAP
         amount: 2
 
 - type: entity
@@ -260,7 +260,7 @@
   - type: StorageFill
     contents:
       - id: SyringeRomerol
-      - id: WeaponRevolverMateba
+      - id: WeaponRevolverPython
       - id: MagazineBoxMagnumIncendiary
       - id: PillAmbuzolPlus
       - id: PillAmbuzol

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -15,9 +15,9 @@
   id: UplinkRevolverPython
   name: uplink-revolver-python-name
   description: uplink-revolver-python-desc
-  productEntity: WeaponRevolverPython
+  productEntity: WeaponRevolverPythonAP
   cost:
-    Telecrystal: 13 #Possibly too expensive, the ammo or gun may need to be cheapened later on if it proves to not be worth it.
+    Telecrystal: 8
   categories:
   - UplinkWeapons
 
@@ -231,13 +231,13 @@
 
 # For the Python
 - type: listing
-  id: UplinkSpeedLoaderMagnum
+  id: UplinkSpeedLoaderMagnumAP
   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-357  }
-  productEntity: SpeedLoaderMagnum357
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon }
+  productEntity: SpeedLoaderMagnumAP
   cost:
-    Telecrystal: 4
+    Telecrystal: 2
   categories:
   - UplinkAmmo
 
@@ -815,7 +815,7 @@
   description: uplink-revolver-cap-gun-fake-desc
   productEntity: RevolverCapGunFake
   cost:
-    Telecrystal: 14
+    Telecrystal: 6
   categories:
   - UplinkJob
   conditions:

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -577,7 +577,6 @@
   components:
   - type: Sprite
 
-#TODO make the sprite look like a python with a cap
 - type: entity
   parent: ToyGunBase
   id: RevolverCapGun
@@ -594,11 +593,13 @@
     heldPrefix: capgun
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 2.25 #same as python
     availableModes:
       - SemiAuto
+    fireRate: 2
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/revolver_357.ogg
+      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+      params:
+        volume: 2.25
     clumsyProof: true
   - type: RevolverAmmoProvider
     whitelist:
@@ -627,9 +628,9 @@
         tags:
           - CartridgeCap
           - SpeedLoaderCap
-          - CartridgeMagnum357
-          - SpeedLoaderMagnum357
-      proto: CartridgeMagnum357
+          - CartridgeMagnum
+          - SpeedLoaderMagnum
+      proto: CartridgeMagnumAP
 
 - type: entity
   parent: BaseItem

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml

@@ -1,4 +1,3 @@
-#.45 rounds
 - type: entity
   id: BaseCartridgeMagnum
   name: cartridge (.45 magnum)
@@ -61,20 +60,14 @@
   - type: CartridgeAmmo
     proto: BulletMagnumIncendiary
 
-#.357 rounds (used in the syndicate Python revolver)
 - type: entity
-  id: CartridgeMagnum357
-  name: cartridge (.357 magnum)
+  id: CartridgeMagnumAP
+  name: cartridge (.45 magnum armor-piercing)
   parent: BaseCartridgeMagnum
   components:
-  - type: Tag
-    tags:
-      - Cartridge
-      - CartridgeMagnum357
   - type: CartridgeAmmo
-    proto: BulletMagnum357
+    proto: BulletMagnumAP
 
-#C.H.I.M.P
 - type: entity
   id: BaseAnomalousCartridge
   parent: BaseCartridgeMagnum
@@ -147,4 +140,3 @@
       color: green
   - type: CartridgeAmmo
     proto: AnomalousParticleOmegaStrong
-

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml

@@ -1,4 +1,3 @@
-#.45 rounds
 - type: entity
   id: BulletMagnum
   name: bullet (.45 magnum)
@@ -19,7 +18,7 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 39
+        Piercing: 44 # 25% increase
 
 - type: entity
   id: BulletMagnumPractice
@@ -56,14 +55,14 @@
       groups:
         Burn: 32
 
-#.357 rounds (used in the syndicate Python revolver)
 - type: entity
-  id: BulletMagnum357
-  name: bullet (.357 magnum)
-  parent: BaseBullet
+  id: BulletMagnumAP
+  name: bullet (.45 magnum armor-piercing)
+  parent: BaseBulletAP
   noSpawn: true
   components:
   - type: Projectile
     damage:
       types:
-        Piercing: 54
+        Piercing: 26 # 20% decrease
+    ignoreResistances: true

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml

@@ -1,4 +1,3 @@
-#.45 rounds
 - type: entity
   id: BaseSpeedLoaderMagnum
   name: "speed loader (.45 magnum)"
@@ -100,27 +99,22 @@
     zeroVisible: false
   - type: Appearance
 
-#.357 rounds (used in the syndicate Python revolver) 
 - type: entity
-  id: SpeedLoaderMagnum357
-  name: "speed loader (.357 magnum)"
+  id: SpeedLoaderMagnumAP
+  name: "speed loader (.45 magnum armor-piercing)"
   parent: BaseSpeedLoaderMagnum
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeMagnum357
-    capacity: 7
+    proto: CartridgeMagnumAP
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
     layers:
-      - state: base-357
+      - state: base
         map: [ "enum.GunVisualLayers.Base" ]
-      - state: threefiftyseven-7
+      - state: base-6
         map: [ "enum.GunVisualLayers.Mag" ]
   - type: MagazineVisuals
-    magState: threefiftyseven
-    steps: 8
+    magState: base
+    steps: 7
     zeroVisible: false
-  - type: Appearance
-  - type: Tag
-    tags:
-      - SpeedLoaderMagnum357
+  - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -144,6 +144,18 @@
   - type: IgniteOnCollide
     fireStacks: 1
 
+- type: entity
+  id: BaseBulletAP
+  name: base bullet armor-piercing
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 11 # 20% decrease
+    ignoreResistances: true
+
 # Energy projectiles
 - type: entity
   name: taser bolt

Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -31,9 +31,9 @@
         - CartridgeMagnum
         - SpeedLoaderMagnum
     proto: CartridgeMagnum
-    capacity: 7
-    chambers: [ True, True, True, True, True, True, True ]
-    ammoSlots: [ null, null, null, null, null, null, null ]
+    capacity: 6
+    chambers: [ True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null ]
     soundEject:
       path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
     soundInsert:
@@ -88,7 +88,7 @@
   name: Mateba
   parent: BaseWeaponRevolver
   id: WeaponRevolverMateba
-  description: The iconic sidearm of the dreaded death squads. Uses .357 magnum ammo.
+  description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
@@ -98,20 +98,12 @@
     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 suspicious revolver commonly used by Syndicate agents. Uses .357 magnum ammo.
+  description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
@@ -119,19 +111,28 @@
     sprite: Objects/Weapons/Guns/Revolvers/python.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 2.25
+    fireRate: 2
     availableModes:
     - SemiAuto
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/revolver_357.ogg
+      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
       params:
         volume: 2.25
+
+- type: entity 
+  name: Python
+  parent: WeaponRevolverPython
+  id: WeaponRevolverPythonAP # For the uplink.
+  suffix: armor-piercing
+  description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo.
+  components:
   - type: RevolverAmmoProvider
     whitelist:
       tags:
-        - CartridgeMagnum357
-        - SpeedLoaderMagnum357
-    proto: CartridgeMagnum357
+        - CartridgeMagnum
+        - SpeedLoaderMagnum
+    proto: CartridgeMagnumAP
+
 
 - type: entity
   name: pirate revolver

Resources/Prototypes/tags.yml

@@ -136,9 +136,6 @@
 - type: Tag
   id: CartridgeMagnum
 
-- type: Tag
-  id: CartridgeMagnum357
-
 - type: Tag
   id: CartridgePistol
 
@@ -765,9 +762,6 @@
 - 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": "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", 
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
     "states": [
         {
             "name": "base"
@@ -84,33 +84,6 @@
         },
         {
             "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"
         }
     ]
 }