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
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@
fireCost: 30 #Mono: 62.5 >> 30
- type: StaticPrice
price: 300
- type: PacifismAllowedGun

- type: entity
name: laser rifle
Expand Down Expand Up @@ -629,6 +630,7 @@
tags:
- Taser
- Sidearm
- type: PacifismAllowedGun

- type: entity
name: disabler
Expand Down Expand Up @@ -657,6 +659,7 @@
guides:
- Security
# - Antagonists # Frontier: removed guidebook entry
- type: PacifismAllowedGun

- type: entity
name: disabler SMG
Expand Down Expand Up @@ -695,6 +698,7 @@
- type: Appearance
- type: StaticPrice
price: 260
- type: PacifismAllowedGun

- type: entity
name: taser
Expand Down Expand Up @@ -731,6 +735,7 @@
steps: 5
zeroVisible: true
- type: Appearance
- type: PacifismAllowedGun

- type: entity
name: antique laser pistol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
- type: HitscanBasicDamage
damage:
types:
Heat: 1
Heat: 0 # Triad 1->0

- type: entity
parent: BasicHitscan
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
- type: Projectile
damage:
types:
Heat: 5
Shock: 0
soundHit:
path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
forceSound: true
Expand Down Expand Up @@ -291,7 +291,7 @@
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 5
Heat: 0
soundHit:
collection: WeakHit
forceSound: true
Expand Down Expand Up @@ -331,7 +331,7 @@
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 1
Heat: 0 # Triad 1->0
soundHit:
collection: WeakHit
forceSound: true
Expand Down Expand Up @@ -1034,7 +1034,7 @@
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 2
Heat: 0
soundHit:
collection: WeakHit
forceSound: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
- type: entity
parent: BulletDisabler
id: BulletDisablerStaminaOnly
name: disabler bolt
categories: [ HideSpawnMenu ]
components:
- type: Projectile
impactEffect: BulletImpactEffectDisabler
damage:
types:
Heat: 0
soundHit:
collection: WeakHit
forceSound: true
# - type: entity
# parent: BulletDisabler
# id: BulletDisablerStaminaOnly
# name: disabler bolt
# categories: [ HideSpawnMenu ]
# components:
# - type: Projectile
# impactEffect: BulletImpactEffectDisabler
# damage:
# types:
# Heat: 0
# soundHit:
# collection: WeakHit
# forceSound: true
# Triad. Use BulletDisabler, wizden changed disablers to do no heat damage.

- type: entity
id: BulletKineticLowPower
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
params:
variation: 0.125
- type: ProjectileBatteryAmmoProvider
proto: BulletDisablerStaminaOnly
proto: BulletDisabler # Triad. Changed to BulletDisabler from BulletDisablerStaminaOnly. BulletDisabler deals no damage.
fireCost: 10
- type: NpcFactionMember
factions:
Expand Down
Loading