diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 85545ac8a7..37c1df8dfb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
# hasn't specified or all
-* @sleepyyapril @VMSolidus @Remuchi
+* @sleepyyapril @Remuchi
/.* @DEATHB4DEFEAT
*.sln @DEATHB4DEFEAT
@@ -95,3 +95,13 @@
/Content.*/ProjectileSystem @angelofallars
/Content.*/ThrownItem @angelofallars
/Content.*/ThrowEvent @angelofallars
+
+# Nyano Systems
+/Content.*/Weapons @VMSolidus
+/Content.*/Abilities/Psionics @VMSolidus
+/Content.*/Psionics @VMSolidus
+/Content.*/Contests @VMSolidus
+/Content.*/Carrying @VMSolidus
+
+# Physics Stuff
+/Content.*/Atmos @VMSolidus
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index ce2228ff66..4e59ff32fe 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -53,16 +53,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
- ///
- /// Maximum amount of targets allowed for a wide-attack.
- ///
- public const int MaxTargets = 5;
-
- ///
- /// If an attack is released within this buffer it's assumed to be full damage.
- ///
- public const float GracePeriod = 0.05f;
-
public override void Initialize()
{
base.Initialize();
@@ -105,7 +95,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
// If someone swaps to this weapon then reset its cd.
var curTime = Timing.CurTime;
- var minimum = curTime + TimeSpan.FromSeconds(GetAttackRate(uid, args.User, component));
+ var minimum = curTime + TimeSpan.FromSeconds(attackRate);
if (minimum < component.NextAttack)
return;
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/Weapons/Melee/combat.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/Weapons/Melee/combat.yml
index dcb7ecfb45..85a5aeea01 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/Weapons/Melee/combat.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/Weapons/Melee/combat.yml
@@ -13,7 +13,7 @@
wideAnimationRotation: -90
soundHit:
path: "/Audio/Weapons/chainsaw.ogg"
- attackRate: 3.5
+ attackRate: 0.3
damage:
types:
Structural: 35