From 6793cb7f499ff3b13d5f33d302d0a87f9ed3ed05 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 1 Jun 2023 12:40:10 +1000 Subject: [PATCH] Nukie berf (#16777) --- .../Shuttles/Systems/EmergencyShuttleSystem.cs | 2 +- .../Entities/Objects/Weapons/Guns/LMGs/lmgs.yml | 10 +++++++--- .../Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 8fa44a2fc1..4062f8cd40 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -291,7 +291,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem // Check for existing centcomms and just point to that var query = AllEntityQuery(); - while (query.MoveNext(out var uid, out var otherComp)) + while (query.MoveNext(out var otherComp)) { if (otherComp == component) continue; diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 8cd65eec5d..646c645f98 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -14,12 +14,16 @@ quickEquip: false slots: - Back + - type: Wieldable + - type: GunWieldBonus + minAngle: -20 + maxAngle: -20 - type: Gun - minAngle: 4 - maxAngle: 20 + minAngle: 24 + maxAngle: 45 angleIncrease: 4 angleDecay: 16 - fireRate: 5 + fireRate: 8 selectedMode: FullAuto availableModes: - FullAuto diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 7974785e9b..486d77825d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -18,8 +18,10 @@ - type: AmmoCounter - type: Gun minAngle: 2 - maxAngle: 8 + maxAngle: 16 fireRate: 8 + angleIncrease: 3 + angleDecay: 16 selectedMode: FullAuto availableModes: - SemiAuto