From 4f0f2fed7f8402cb4828e2e65f25bb8583226de0 Mon Sep 17 00:00:00 2001 From: Niko_de16 Date: Thu, 26 Mar 2026 01:15:12 -0500 Subject: [PATCH 1/2] Adds PMC Energy Shotgun to the Merc-Vend [ Adds the PMC Energy Shotgun to the Merc-Vend and changes its disabler shot cost to 100 to make its non-lethal option a tiny bit better on both versions ] --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 3 +++ .../Floof/Entities/Objects/Weapons/guns.yml | 2 +- .../Entities/Objects/Weapons/Guns/registered.yml | 14 ++++++++++++++ .../_NF/Catalog/mercenary_uplink_catalog.yml | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 21107b1c58c..71dac30383a 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -499,6 +499,9 @@ uplink-mercenary-vortex12shotty-desc = Designed by SESWC. A semi-automatic magaz uplink-mercenary-bigjohnnyshotty-name = Big Johnny (4 gauge) uplink-mercenary-bigjohnnyshotty-desc = An old yet faithful design, and a favorite among irregular forces on many worlds. +uplink-mercenary-energyshotgun-name = PMC Energy Shotgun +uplink-mercenary-energyshotgun-desc = A PMC version of the "One-Of-A-Kind" energy shotgun. Registered for mercenary use in a more mass-producable fashion. + uplink-mercenary-surplusdrozd-name = Surplus Drozd uplink-mercenary-surplusdrozd-desc = Based on an old design, this SMG is still more than capable of putting rounds down-range. diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml index d30d65e083a..403db3457a5 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml @@ -158,7 +158,7 @@ - proto: HLBulletLaserSpreadNarrow fireCost: 200 - proto: HLBulletDisablerSmgSpread - fireCost: 120 + fireCost: 100 - type: Item size: Large shape: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml index 37f7ff8e3ac..8931706a59a 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml @@ -143,3 +143,17 @@ # components: # - type: PirateBountyItem # id: CFCMLongarm + +- type: entity # PMC Energy Shotgun + parent: + - BaseWeaponEnergyShotgun + - BaseC2ContrabandUnredeemable + name: PMC Energy Shotgun + id: EnergyShotgunPMC + description: A PMC version of the "One-Of-A-Kind" energy shotgun. Registered for mercenary use in a more mass-producable fashion. + components: + - type: PirateBountyItem + id: PMCGun + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 65 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml index aa3c4ab95c0..fe4da5ad340 100644 --- a/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml @@ -999,6 +999,22 @@ tags: - MercenaryUplink +- type: listing + id: UplinkMercenaryPMCEnergyShotgun + name: uplink-mercenary-energyshotgun-name + description: uplink-mercenary-energyshotgun-desc + productEntity: EnergyShotgunPMC + icon: { sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi, state: icon } + cost: + MercCoin: 35 + categories: + - UplinkMercenaryShotguns + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - MercenaryUplink + # SMGs - type: listing id: UplinkMercenarySurpDrozd From 344f148b0699b923a3f4ce1bef091b46da6323eb Mon Sep 17 00:00:00 2001 From: Niko_de16 Date: Thu, 26 Mar 2026 17:31:45 -0500 Subject: [PATCH 2/2] Slight Tweaks [ Nerfs its max charge to 1000 instead of 1200, and fixes BOTH energy shotgun versions to not do heat damage on their disabler setting, its truly non-lethal now :3 ] --- .../_Mono/Entities/Objects/Weapons/Guns/registered.yml | 5 ++++- .../Objects/Weapons/Guns/Ammunition/Projectiles/energy.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml index 8931706a59a..e313cf3d71d 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Weapons/Guns/registered.yml @@ -146,7 +146,7 @@ - type: entity # PMC Energy Shotgun parent: - - BaseWeaponEnergyShotgun + - WeaponEnergyShotgun - BaseC2ContrabandUnredeemable name: PMC Energy Shotgun id: EnergyShotgunPMC @@ -154,6 +154,9 @@ components: - type: PirateBountyItem id: PMCGun + - type: Battery + maxCharge: 1000 + startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 65 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/energy.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/energy.yml index fd8a646b48a..5c9d103de87 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/energy.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/energy.yml @@ -129,7 +129,7 @@ impactEffect: BulletImpactEffectDisabler damage: types: - Heat: 1 + Heat: 0 soundHit: collection: WeakHit forceSound: true