From 6a2aac39e47180a17827695b59f8b8e44a69bdcc Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Wed, 2 Aug 2023 13:03:39 +0300 Subject: [PATCH] Magazine for C20R in uplink (#17108) --- .../Locale/en-US/store/uplink-catalog.ftl | 3 +++ .../Prototypes/Catalog/uplink_catalog.yml | 17 +++++++++++++++++ .../Magazine/Pistol/smg_mag.rsi/meta.json | 3 +++ .../Magazine/Pistol/smg_mag.rsi/red-icon.png | Bin 0 -> 225 bytes 4 files changed, 23 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 1812097dda..3c438be955 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -58,6 +58,9 @@ uplink-exploding-pen-desc = A class IV explosive device contained within a stand uplink-pistol-magazine-name = Pistol Magazine (.35 auto) uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with the Viper. +uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto) +uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible with C-20r. + uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index fdb0e69d5f..7d4c907539 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -217,6 +217,23 @@ categories: - UplinkAmmo +# For the C20R +- type: listing + id: UplinkMagazinePistolSubMachineGun + name: uplink-pistol-magazine-c20r-name + description: uplink-pistol-magazine-c20r-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } + productEntity: MagazinePistolSubMachineGun + cost: + Telecrystal: 3 + categories: + - UplinkAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + # For the Cobra - type: listing id: UplinkMagazinePistolCaselessRifle diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json index 0d4f33e770..6fc0edd751 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "red" }, + { + "name": "red-icon" + }, { "name": "rubber" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7575ed150c31cb2a4a4b593eacb236a727dfabed GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWT!FNt zq@+20S`;y|08NgcK$C_T=Xr7N$B!9;h#aulmD+w`?K3! z*W^mN&_cP}35V)FE^&CwB+I&kI?g$XT>ug{Lhtjs$gmCG`+b6Xe@)LtDnm{ Hr-UW|UfEIc literal 0 HcmV?d00001