Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
- proto: HLBulletLaserSpreadNarrow
fireCost: 200
- proto: HLBulletDisablerSmgSpread
fireCost: 120
fireCost: 100
- type: Item
size: Large
shape:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,20 @@
# components:
# - type: PirateBountyItem
# id: CFCMLongarm

- type: entity # PMC Energy Shotgun
parent:
- WeaponEnergyShotgun
- 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: Battery
maxCharge: 1000
startingCharge: 1000
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 65
16 changes: 16 additions & 0 deletions Resources/Prototypes/_NF/Catalog/mercenary_uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 1
Heat: 0
soundHit:
collection: WeakHit
forceSound: true
Expand Down
Loading