From d65cdfff90dbe076856ac79c0280d2f4e4b96471 Mon Sep 17 00:00:00 2001 From: keekee38 Date: Wed, 15 Apr 2026 14:52:04 -0400 Subject: [PATCH] readding machine pistol mag compatability for the viper (#5654) i wonder who messed that one up... --- Resources/Locale/en-US/_DV/store/uplink/ammo.ftl | 3 +++ Resources/Prototypes/Catalog/uplink_catalog.yml | 10 +++++----- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_DV/store/uplink/ammo.ftl b/Resources/Locale/en-US/_DV/store/uplink/ammo.ftl index 7a43dd1d1d..710b2c7663 100644 --- a/Resources/Locale/en-US/_DV/store/uplink/ammo.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink/ammo.ftl @@ -1,2 +1,5 @@ uplink-speedloader-magnum-regular-name = Speedloader (.45 magnum) uplink-speedloader-magnum-regular-desc = Revolver speedloader with 6 regular catridges. Compatible with the Python. + +uplink-pistol-magazine-delta-name = Machine pistol magazine (.35 auto) +uplink-pistol-magazine-delta-desc = Machine pistol magazine with 20 cartridges. Compatible with the Viper. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f63b26ed6b..1b91001208 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -66,7 +66,7 @@ categories: - UplinkWeaponry -# Deltav changes begin +# Deltav changes begin - type: listing id: UplinkHypereutacticBlade name: uplink-hypereutactic-blade-name @@ -545,8 +545,8 @@ - type: listing id: UplinkPistol9mmMagazine - name: uplink-pistol-magazine-name - description: uplink-pistol-magazine-desc + name: uplink-pistol-magazine-delta-name # DeltaV - to make it clear that these arent the same as normal pistol mags + description: uplink-pistol-magazine-delta-desc # DeltaV - 20 round capacity icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: base-icon } productEntity: MagazinePistolHighCapacity cost: @@ -1871,8 +1871,8 @@ tags: # - NukeOpsUplink # DeltaV - Commented out as of #5462 (only commander and loneop can get suit) # Begin DeltaV additions - Jugsuit buy limit #5462 - - CommanderUplink - - LoneOpUplink + - CommanderUplink + - LoneOpUplink - !type:ListingLimitedStockCondition stock: 1 # End DeltaV additions diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c00789d0ca..98225680d4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -93,6 +93,7 @@ whitelist: tags: - MagazinePistol + - MagazinePistolHighCapacity whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber