From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Tue, 13 Jan 2026 18:17:22 +0000 (+0100) Subject: Viper High Capacity Ammo (#42392) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c860502e66b4fb71b79e9053d12e7ccfc40a3417;p=space-station-14.git Viper High Capacity Ammo (#42392) * yeah * Fix sprite & let mk58 use the mag --------- Co-authored-by: SlamBamActionman --- diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 70d7ea80c6..e8fdbf4ff2 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -92,7 +92,7 @@ uplink-shrapnel-grenade-desc = Launches a spray of sharp fragments dealing great # Ammo uplink-pistol-magazine-name = Pistol Magazine (.35 auto) -uplink-pistol-magazine-desc = Pistol magazine with 10 cartridges. Compatible with the Viper. +uplink-pistol-magazine-desc = Pistol magazine with 15 cartridges. Compatible with the Viper. uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto) uplink-pistol-magazine-c20r-desc = SMG magazine with 30 cartridges. Compatible with C-20r. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 033327ef2b..2636b80d42 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -524,8 +524,8 @@ id: UplinkPistol9mmMagazine name: uplink-pistol-magazine-name description: uplink-pistol-magazine-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } - productEntity: MagazinePistol + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: base-icon } + productEntity: MagazinePistolHighCapacity cost: Telecrystal: 1 categories: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index b57453793e..5437e4a200 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -45,7 +45,7 @@ whitelist: tags: - CartridgePistol - capacity: 16 + capacity: 15 - type: Item size: Small - type: ContainerContainer @@ -396,7 +396,7 @@ id: MagazinePistolHighCapacityEmpty name: machine pistol magazine (.35 auto any) suffix: empty - description: Custom 16-round double-stack magazine for the Viper pistol. + description: Custom 15-round double-stack magazine for the Viper pistol. components: - type: BallisticAmmoProvider proto: null @@ -417,7 +417,7 @@ parent: BaseMagazinePistolHighCapacity id: MagazinePistolHighCapacity name: machine pistol magazine (.35 auto) - description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition. + description: Custom 15-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistol @@ -438,7 +438,7 @@ parent: BaseMagazinePistolHighCapacity id: MagazinePistolHighCapacityPractice name: machine pistol magazine (.35 auto practice) - description: Custom 16-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition. + description: Custom 15-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition. components: - type: BallisticAmmoProvider proto: CartridgePistolPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 74010b3f42..126b546a30 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -48,6 +48,7 @@ whitelist: tags: - MagazinePistol + - MagazinePistolHighCapacity whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber @@ -80,7 +81,7 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistol + startingItem: MagazinePistolHighCapacity insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png new file mode 100644 index 0000000000..40b0988c3e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index 4a31ca1326..1bab5b591e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.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, inhands by TiniestShark (github)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github), base-icon made via base combined with mag-5 by SlamBamActionman (github)", "states": [ { "name": "base" @@ -43,6 +43,9 @@ { "name": "inhand-right-stripe", "directions": 4 + }, + { + "name": "base-icon" } ] }