From: Nox Date: Wed, 12 Feb 2025 00:43:10 +0000 (-0800) Subject: Deathsquad revolver ammo fix (#34910) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=129bcdfeb77eef561bcf5cd4c5ec72ba888a7651;p=space-station-14.git Deathsquad revolver ammo fix (#34910) * Added AP version of mateba, and put it in the deathsquad starting equipment. * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 309c2c502d..b5bc7f6805 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -108,6 +108,14 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg +- type: entity + parent: WeaponRevolverMateba + id: WeaponRevolverMatebaAP # For deathsquad + suffix: armor-piercing + components: + - type: RevolverAmmoProvider + proto: CartridgeMagnumAP + - type: entity name: Python parent: [BaseWeaponRevolver, BaseSyndicateContraband] diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml index 5f731fa582..ae890f7061 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml @@ -31,7 +31,7 @@ storage: back: - WeaponPulsePistol - - WeaponRevolverMateba + - WeaponRevolverMatebaAP - SpeedLoaderMagnumAP - SpeedLoaderMagnumAP - BoxFlashbang