Readds Tasers to Security (#39087)
* Readds taser to security * removes item drop from regular tasers, adds item drop to admeme tasers * Fixes stun on collide options * Fixes drop * Lowers fire rate for taser
This commit is contained in:
parent
1a06e97f31
commit
04344ff872
|
|
@ -27,6 +27,7 @@ internal sealed class StunOnCollideSystem : EntitySystem
|
|||
if (ent.Comp.Refresh)
|
||||
{
|
||||
_stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
|
||||
|
||||
_movementMod.TryUpdateMovementSpeedModDuration(
|
||||
target,
|
||||
MovementModStatusSystem.TaserSlowdown,
|
||||
|
|
|
|||
|
|
@ -361,6 +361,7 @@
|
|||
- id: SecurityTechFabCircuitboard
|
||||
- id: CargoRequestSecurityComputerCircuitboard
|
||||
- id: WeaponDisabler
|
||||
- id: WeaponTaser
|
||||
#- id: WantedListCartridge # DeltaV - replaced by secwatch
|
||||
- id: DrinkHosFlask
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
children:
|
||||
- id: FlashlightSeclite
|
||||
- id: WeaponDisabler
|
||||
- id: WeaponTaser
|
||||
- id: ClothingBeltSecurityFilled
|
||||
- id: Flash
|
||||
- id: ClothingEyesGlassesSecurity
|
||||
|
|
@ -84,6 +85,7 @@
|
|||
- id: FlashlightSeclite
|
||||
prob: 0.8
|
||||
- id: WeaponDisabler
|
||||
- id: WeaponTaser
|
||||
#- id: ClothingUniformJumpsuitSecGrey # DeltaV - remove uniforms from sec lockers
|
||||
# prob: 0.3
|
||||
- id: ClothingHeadHelmetBasic
|
||||
|
|
@ -122,6 +124,7 @@
|
|||
id: FillLockerBrigmedic
|
||||
table: !type:AllSelector
|
||||
children:
|
||||
- id: WeaponTaser
|
||||
- id: ClothingEyesGlassesCorpsman
|
||||
- id: WeaponDisabler
|
||||
- id: TrackingImplanter
|
||||
|
|
|
|||
|
|
@ -663,6 +663,7 @@
|
|||
slots:
|
||||
- Belt
|
||||
- type: Gun
|
||||
fireRate: 0.5
|
||||
soundGunshot:
|
||||
path: /Audio/Weapons/Guns/Gunshots/taser.ogg
|
||||
- type: ProjectileBatteryAmmoProvider
|
||||
|
|
|
|||
|
|
@ -238,7 +238,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
|
||||
|
|
@ -266,6 +267,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
|
||||
|
|
|
|||
Loading…
Reference in New Issue