From 14ea7b440718b8e60a3d375def817464f60885bb Mon Sep 17 00:00:00 2001 From: TheRealMasterChief117 Date: Sat, 23 May 2026 12:12:44 -0400 Subject: [PATCH 1/2] fixes --- .../Weapons/Guns/Projectiles/projectiles.yml | 4 +-- .../Weapons/Guns/Projectiles/energy.yml | 29 ++++++++++--------- .../Entities/Objects/Weapons/Guns/turrets.yml | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e748e1ee47e..929d4c9a20c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -291,7 +291,7 @@ impactEffect: BulletImpactEffectDisabler damage: types: - Heat: 5 + Heat: 0 soundHit: collection: WeakHit forceSound: true @@ -1034,7 +1034,7 @@ impactEffect: BulletImpactEffectDisabler damage: types: - Heat: 2 + Heat: 0 soundHit: collection: WeakHit forceSound: true diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml index 33f4f5cd60b..93de89053dc 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/energy.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml index 4e19826cfdb..1a635d85357 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml @@ -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: From 46f32b2e366b42c7988e9c6911a4db3e544d9d40 Mon Sep 17 00:00:00 2001 From: TheRealMasterChief117 Date: Sat, 23 May 2026 12:19:50 -0400 Subject: [PATCH 2/2] taser --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 5 +++++ .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 2 +- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 66548a13be1..547170eb596 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -276,6 +276,7 @@ fireCost: 30 #Mono: 62.5 >> 30 - type: StaticPrice price: 300 + - type: PacifismAllowedGun - type: entity name: laser rifle @@ -629,6 +630,7 @@ tags: - Taser - Sidearm + - type: PacifismAllowedGun - type: entity name: disabler @@ -657,6 +659,7 @@ guides: - Security # - Antagonists # Frontier: removed guidebook entry + - type: PacifismAllowedGun - type: entity name: disabler SMG @@ -695,6 +698,7 @@ - type: Appearance - type: StaticPrice price: 260 + - type: PacifismAllowedGun - type: entity name: taser @@ -731,6 +735,7 @@ steps: 5 zeroVisible: true - type: Appearance + - type: PacifismAllowedGun - type: entity name: antique laser pistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index bb52819ffc9..605432607d3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -93,7 +93,7 @@ - type: HitscanBasicDamage damage: types: - Heat: 1 + Heat: 0 # Triad 1->0 - type: entity parent: BasicHitscan diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 929d4c9a20c..f68c9deff61 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -245,7 +245,7 @@ - type: Projectile damage: types: - Heat: 5 + Shock: 0 soundHit: path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg" forceSound: true @@ -331,7 +331,7 @@ impactEffect: BulletImpactEffectDisabler damage: types: - Heat: 1 + Heat: 0 # Triad 1->0 soundHit: collection: WeakHit forceSound: true