Всякие вещи (#442)

* - fix: No grabbing supermatter.

* - remove: No screen shake.

* - tweak: Revert tweaks.

* - fix: Telescope.

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<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
+            /* if (TryComp<PhysicsComponent>(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<EmbeddableProjectileComponent>(uid) && TryComp<PhysicsComponent>(uid, out var physics)) // WD EDIT

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<PhysicsComponent>(target, out var physics) && physics.BodyType == BodyType.Static ||
             HasComp<WallMountComponent>(target) ||
-            HasComp<MobStateComponent>(target))
+            HasComp<MobStateComponent>(target) ||
+            HasComp<SupermatterComponent>(target)) // WD EDIT
         {
             return;
         }

Content.Server/Projectiles/ProjectileSystem.cs

@@ -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;

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 &&

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

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:

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: