diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs index 406ad69a3b..7447271526 100644 --- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs @@ -58,11 +58,12 @@ namespace Content.Server.Damage.Systems } _guns.PlayImpactSound(args.Target, dmg, component.Sound, component.Sound != null); // WD EDIT - if (TryComp(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f) + /* if (TryComp(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f) { var direction = body.LinearVelocity.Normalized(); _sharedCameraRecoil.KickCamera(args.Target, direction); - } + }*/ + // WD EDIT // TODO: If more stuff touches this then handle it after. if (!HasComp(uid) && TryComp(uid, out var physics)) // WD EDIT diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs index 4b2ba8ffbd..afa36a6180 100644 --- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs +++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Interaction; using Content.Server.Mech.Equipment.Components; using Content.Server.Mech.Systems; +using Content.Shared._White.Supermatter.Components; using Content.Shared.DoAfter; using Content.Shared.Interaction; using Content.Shared.Mech; @@ -133,7 +134,8 @@ public sealed class MechGrabberSystem : EntitySystem if (TryComp(target, out var physics) && physics.BodyType == BodyType.Static || HasComp(target) || - HasComp(target)) + HasComp(target) || + HasComp(target)) // WD EDIT { return; } diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index 6431ba87de..cbe05d1a77 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -51,7 +51,7 @@ public sealed class ProjectileSystem : SharedProjectileSystem { return; } - + // it's here so this check is only done once before possible hit var attemptEv = new ProjectileReflectAttemptEvent(uid, component, false); RaiseLocalEvent(target, ref attemptEv); @@ -84,7 +84,8 @@ public sealed class ProjectileSystem : SharedProjectileSystem if (!deleted) { _guns.PlayImpactSound(target, modifiedDamage, component.SoundHit, component.ForceSound); - _sharedCameraRecoil.KickCamera(target, direction); + // _sharedCameraRecoil.KickCamera(target, direction); + // WD EDIT } component.DamagedEntity = true; diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs index 7d94ada924..007a7dc732 100644 --- a/Content.Shared/Throwing/ThrowingSystem.cs +++ b/Content.Shared/Throwing/ThrowingSystem.cs @@ -188,8 +188,9 @@ public sealed class ThrowingSystem : EntitySystem if (user == null) return; - if (recoil) - _recoil.KickCamera(user.Value, -direction * 0.04f); + // if (recoil) + // _recoil.KickCamera(user.Value, -direction * 0.04f); + // WD EDIT // Give thrower an impulse in the other direction if (pushbackRatio != 0.0f && diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index ee2bcf93c6..8a949367e2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -294,7 +294,7 @@ - type: TentacleGun - type: Gun soundGunshot: /Audio/Effects/gib1.ogg - fireRate: 0.5 + fireRate: 0.33 selectedMode: PullMob availableModes: - PullItem @@ -305,7 +305,7 @@ count: 1 - type: AmmoCounter - type: RechargeBasicEntityAmmo - rechargeCooldown: 1.5 + rechargeCooldown: 1 playRechargeSound: false - type: Sprite sprite: Objects/Weapons/Guns/Launchers/tentacle_gun.rsi diff --git a/Resources/Prototypes/_White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml index 1dc52bbc7c..ba91c9f84f 100644 --- a/Resources/Prototypes/_White/Actions/types.yml +++ b/Resources/Prototypes/_White/Actions/types.yml @@ -20,7 +20,7 @@ noSpawn: true components: - type: InstantAction - useDelay: 2.5 + useDelay: 1.5 itemIconStyle: BigAction priority: -20 icon: @@ -51,7 +51,7 @@ - type: InstantAction itemIconStyle: BigAction priority: -20 - icon: + icon: sprite: Objects\Specific\Security\body-camera.rsi state: unpowered - event: !type:ToggleBodyCameraEvent \ No newline at end of file + event: !type:ToggleBodyCameraEvent diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml index 56570149b5..afa4339a54 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml @@ -18,8 +18,8 @@ - type: DamageOtherOnHit damage: types: - Piercing: 30 - Heat: 30 + Piercing: 20 + Heat: 20 - type: Wieldable - type: IncreaseDamageOnWield damage: