Reapply "Readds Tasers to Security (#39087)"

This reverts commit 90b438635d.
This commit is contained in:
Vasilis The Pikachu
2025-10-12 21:33:18 +02:00
parent 68d76eaf5c
commit 2a261d3bc0
6 changed files with 17 additions and 1 deletions

View File

@@ -27,6 +27,7 @@ internal sealed class StunOnCollideSystem : EntitySystem
if (ent.Comp.Refresh) if (ent.Comp.Refresh)
{ {
_stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount); _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
_movementMod.TryUpdateMovementSpeedModDuration( _movementMod.TryUpdateMovementSpeedModDuration(
target, target,
MovementModStatusSystem.TaserSlowdown, MovementModStatusSystem.TaserSlowdown,

View File

@@ -3572,6 +3572,14 @@
id: 9012 id: 9012
time: '2025-09-27T20:51:52.0000000+00:00' time: '2025-09-27T20:51:52.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/40572 url: https://github.com/space-wizards/space-station-14/pull/40572
- author: keronshb
changes:
- message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
to become prone, are now added into Warden, HoS, and Security locker fills.'
type: Add
id: 9013
time: '2025-09-27T21:21:05.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/39087
- author: SurrealShibe - author: SurrealShibe
changes: changes:
- message: Vulpkanin now audibly gasp. - message: Vulpkanin now audibly gasp.

View File

@@ -324,6 +324,7 @@
- id: RubberStampHos - id: RubberStampHos
- id: BoxHoSCircuitboards - id: BoxHoSCircuitboards
- id: WeaponDisabler - id: WeaponDisabler
- id: WeaponTaser
- id: WantedListCartridge - id: WantedListCartridge
- id: DrinkHosFlask - id: DrinkHosFlask

View File

@@ -28,6 +28,7 @@
children: children:
- id: FlashlightSeclite - id: FlashlightSeclite
- id: WeaponDisabler - id: WeaponDisabler
- id: WeaponTaser
- id: ClothingBeltSecurityFilled - id: ClothingBeltSecurityFilled
- id: Flash - id: Flash
- id: ClothingEyesGlassesSecurity - id: ClothingEyesGlassesSecurity
@@ -72,6 +73,7 @@
- id: FlashlightSeclite - id: FlashlightSeclite
prob: 0.8 prob: 0.8
- id: WeaponDisabler - id: WeaponDisabler
- id: WeaponTaser
- id: ClothingUniformJumpsuitSecGrey - id: ClothingUniformJumpsuitSecGrey
prob: 0.3 prob: 0.3
- id: ClothingHeadHelmetBasic - id: ClothingHeadHelmetBasic
@@ -105,6 +107,7 @@
table: !type:AllSelector table: !type:AllSelector
children: children:
- id: ClothingEyesGlassesSecurity - id: ClothingEyesGlassesSecurity
- id: WeaponTaser
- id: WeaponDisabler - id: WeaponDisabler
- id: TrackingImplanter - id: TrackingImplanter
amount: 2 amount: 2

View File

@@ -611,6 +611,7 @@
slots: slots:
- Belt - Belt
- type: Gun - type: Gun
fireRate: 0.5
soundGunshot: soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser.ogg path: /Audio/Weapons/Guns/Gunshots/taser.ogg
- type: ProjectileBatteryAmmoProvider - type: ProjectileBatteryAmmoProvider

View File

@@ -227,7 +227,8 @@
lifetime: 0.170 # Very short range lifetime: 0.170 # Very short range
- type: StunOnCollide - type: StunOnCollide
stunAmount: 0 stunAmount: 0
knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton
drop: false #Ranged KD and item drop are too strong in one package
slowdownAmount: 2.5 slowdownAmount: 2.5
walkSpeedModifier: 0.5 walkSpeedModifier: 0.5
sprintSpeedModifier: 0.5 sprintSpeedModifier: 0.5
@@ -255,6 +256,7 @@
lifetime: 1.0 # Not so short range lifetime: 1.0 # Not so short range
- type: StunOnCollide - type: StunOnCollide
stunAmount: 5 stunAmount: 5
drop: true # this is the evil taser
knockdownAmount: 10 knockdownAmount: 10
slowdownAmount: 10 slowdownAmount: 10
walkSpeedModifier: 0.5 walkSpeedModifier: 0.5