Reapply "Readds Tasers to Security (#39087)"
This reverts commit 90b438635d.
This commit is contained in:
@@ -27,6 +27,7 @@ internal sealed class StunOnCollideSystem : EntitySystem
|
||||
if (ent.Comp.Refresh)
|
||||
{
|
||||
_stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
|
||||
|
||||
_movementMod.TryUpdateMovementSpeedModDuration(
|
||||
target,
|
||||
MovementModStatusSystem.TaserSlowdown,
|
||||
|
||||
@@ -3572,6 +3572,14 @@
|
||||
id: 9012
|
||||
time: '2025-09-27T20:51:52.0000000+00:00'
|
||||
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
|
||||
changes:
|
||||
- message: Vulpkanin now audibly gasp.
|
||||
|
||||
@@ -324,6 +324,7 @@
|
||||
- id: RubberStampHos
|
||||
- id: BoxHoSCircuitboards
|
||||
- id: WeaponDisabler
|
||||
- id: WeaponTaser
|
||||
- id: WantedListCartridge
|
||||
- id: DrinkHosFlask
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
children:
|
||||
- id: FlashlightSeclite
|
||||
- id: WeaponDisabler
|
||||
- id: WeaponTaser
|
||||
- id: ClothingBeltSecurityFilled
|
||||
- id: Flash
|
||||
- id: ClothingEyesGlassesSecurity
|
||||
@@ -72,6 +73,7 @@
|
||||
- id: FlashlightSeclite
|
||||
prob: 0.8
|
||||
- id: WeaponDisabler
|
||||
- id: WeaponTaser
|
||||
- id: ClothingUniformJumpsuitSecGrey
|
||||
prob: 0.3
|
||||
- id: ClothingHeadHelmetBasic
|
||||
@@ -105,6 +107,7 @@
|
||||
table: !type:AllSelector
|
||||
children:
|
||||
- id: ClothingEyesGlassesSecurity
|
||||
- id: WeaponTaser
|
||||
- id: WeaponDisabler
|
||||
- id: TrackingImplanter
|
||||
amount: 2
|
||||
|
||||
@@ -611,6 +611,7 @@
|
||||
slots:
|
||||
- Belt
|
||||
- type: Gun
|
||||
fireRate: 0.5
|
||||
soundGunshot:
|
||||
path: /Audio/Weapons/Guns/Gunshots/taser.ogg
|
||||
- type: ProjectileBatteryAmmoProvider
|
||||
|
||||
@@ -227,7 +227,8 @@
|
||||
lifetime: 0.170 # Very short range
|
||||
- type: StunOnCollide
|
||||
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
|
||||
walkSpeedModifier: 0.5
|
||||
sprintSpeedModifier: 0.5
|
||||
@@ -255,6 +256,7 @@
|
||||
lifetime: 1.0 # Not so short range
|
||||
- type: StunOnCollide
|
||||
stunAmount: 5
|
||||
drop: true # this is the evil taser
|
||||
knockdownAmount: 10
|
||||
slowdownAmount: 10
|
||||
walkSpeedModifier: 0.5
|
||||
|
||||
Reference in New Issue
Block a user