From c860502e66b4fb71b79e9053d12e7ccfc40a3417 Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Tue, 13 Jan 2026 19:17:22 +0100 Subject: [PATCH] Viper High Capacity Ammo (#42392) * yeah * Fix sprite & let mk58 use the mag --------- Co-authored-by: SlamBamActionman --- Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +- Resources/Prototypes/Catalog/uplink_catalog.yml | 4 ++-- .../Guns/Ammunition/Magazines/pistol.yml | 8 ++++---- .../Objects/Weapons/Guns/Pistols/pistols.yml | 3 ++- .../pistol_high_capacity_mag.rsi/base-icon.png | Bin 0 -> 15145 bytes .../pistol_high_capacity_mag.rsi/meta.json | 5 ++++- 6 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base-icon.png 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 0000000000000000000000000000000000000000..40b0988c3ec594d5a34095739086046a48d38257 GIT binary patch literal 15145 zcmeI3UuYaf9LFb?wl>lt_|RAgu2<_HbZ`IMzuay_Cz1v-H zH@!;`j8=*Tkq|_r7VLxAz9>EveDI-)245{o1yKZ%`lpqMD7LhC&hFly&E#$fTJdEL z?sk9ko!{>_^O^b0?aQ8=oH)3%cTX<>VCUFqb_!oP_j~&`{A({R{*Es@tkJ_Z0C(Kw zetW>F(|rIWuj=_3XC^nUsAf3~HM4-iwX%hK1CSc5Sx`NS9Ik+7bt4^G``|)|)3tQy zP%J0rtYI{#k1kfw^x{NbT|BBLwa{RuH&s(`fHHC*S1XqcTdAc(UR(v=yUjv~^SU@k z)1e_ZAvcqo=CSRxTkJi^JM6cfaV5D|GfqC`a{DszobDASAY zQWdSJOl1!=(qStdnsXdW5rk^B8m>mdW@T28lF6hX%7QHOxCd`97!IuQhP~Gh(u|Wu zwp!6GM>h@5jSCCryps-v+(fNUV_s#emB_Fg>@Y>41}#Afi$W(SO>OyD^Oce}G))yy z36+uI*w|0%=x5EDj%m-CT~fB>u8HxQp@TBAC`Wlo=B0tWlu$&xAEk#y3Eu>Q_&tdj zIaAY%3(XjDUX*w#l9vV)F`~qh!5D#_WDHzC8g$^Mq6GT};%KT;G%IE3Wb`teMS^9_ zri6B5pl54WDZ^&Ttl(jxOe7_AY7TgLJ53ogYzG=D8p~#ILs-`}r2q?sSR`8HRXHBx zkr)+uh*ZdnQKSvPWUMGlNe^N!7j)kcI%}%)Znfah{=uS|Dh}TsmKGmS69WkHMG<1i zQqfI>G+tGsk`~usF&2+D69s~8Nc31m$LAg_1^T#i(QvYuh@vPVLLNap7gdf*d@`m< zJe1>cRf}i^QPr9$I)vGfYE-xJZe0lMV!W5VlWiJ3v%a+{lyvWevS7tVZvCZ0%>ry4 zX{{5>_3`RhfvS79WmLC35FX;X*7mSko((sB<8p2efgeBM-aSWk4jHua@!_+&?D;S25mE(5oIPC2VMGXZHKgxYbyi_xdMf5q|{9 z{cX4gWzzL9-8Cqau5HgJ4Bg4djci17z{~vy^^f;y{IG{I@mMSpO9^B%=`pF-P-!Ns z<8#<{&yxtww$AadA3fmTY1x-(XEV1 z#9~PZAas-AqVpkChKm3~HyJKEA3|lg2q1Km;iB^)RECQHLN^&MIv+x1xCkJ0li{NC zAykHo075qzE;=7VWw;0+bd%wt^C47*ivU7587?{>LS?uJAas-AqVpkChKm3~HyJKE zA3|lg2q1Km;iB^)RECQHLN^&MIv+x1xCkJ0li{NCAykHo075qzE;=7VWw;0+bd%wt z^C47*ivU7587?{>LS?uJAas-AqVpkChKm3~HyJKEA3|lg2q1Km;iB^)RECQHLN}?n zdfTsXA_Kp-S;a4CnrAMh@XMW?Iy#jDU~wM+OUD7YUdPv;0GJm6`1uF`%Ig5^Hdmfr zJ%IbZKb9TJ*S;!TtJeoV-d{NJ`1Y5TC2i;Ad*@I7S^wk44(r*g@A$2LcVFMR zHQ+2SFaLT^zj@_{8{htT?~Mx=hhMwz;PNj^D=RDYE0^9mt~%Qhv^5*AX_q_PsoA>YH z_FX&p$`)&NFxS6-{O0sGJ#THRpWAZc?3R~4irOE}T{!YZ&-qW5dcaow^zzW|{#|$q OU~FU}`|hJhUicdttbDit literal 0 HcmV?d00001 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" } ] } -- 2.52.0