diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index fca50b8003..f2c9d6532c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -75,7 +75,7 @@ - type: StorageFill contents: - id: WeaponLightMachineGunL6 - - id: MagazineBoxLightRifle + - id: MagazineLightRifleBox - type: entity parent: ClothingBackpackDuffelSyndicateAmmo diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index a9f5d77a77..cdf9090767 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -34,16 +34,18 @@ # Magazines - type: entity - id: MagazineBoxLightRifle + id: MagazineLightRifleBox name: "L6 SAW magazine box (.30 rifle)" parent: BaseMagazineLightRifle components: - type: Tag tags: - - MagazineBoxLightRifle + - MagazineLightRifleBox - type: BallisticAmmoProvider proto: CartridgeLightRifle - capacity: 50 + capacity: 100 + - type: Item + size: 10 - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi - type: Appearance @@ -144,7 +146,7 @@ components: - type: Tag tags: - - MagazineBoxLightRifle + - MagazineLightRifleBox - type: BallisticAmmoProvider proto: CartridgeLightRifle capacity: 80 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 26c8f4e15d..0b9d9dd3cd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -8,8 +8,12 @@ - type: Sprite netsync: false - type: Item - size: 24 + size: 60 - type: Gun + minAngle: 4 + maxAngle: 16 + angleIncrease: 0.5 + angleDecay: 12 fireRate: 8 selectedMode: FullAuto availableModes: @@ -19,16 +23,17 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - type: ChamberMagazineAmmoProvider + - type: AmmoCounter - type: ItemSlots slots: gun_magazine: name: Magazine - startingItem: MagazineBoxLightRifle + startingItem: MagazineLightRifleBox insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg whitelist: tags: - - MagazineBoxLightRifle + - MagazineLightRifleBox gun_chamber: name: Chamber startingItem: CartridgeLightRifle @@ -54,7 +59,6 @@ - state: mag-3 map: ["enum.GunVisualLayers.Mag"] - type: Item - size: 24 sprite: Objects/Weapons/Guns/LMGs/l6.rsi - type: Appearance visuals: diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index b301e591c1..1d99aab74a 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -239,9 +239,6 @@ # Magazines ordered by slot then caliber -- type: Tag - id: MagazineBoxLightRifle - - type: Tag id: MagazineCalico @@ -257,6 +254,9 @@ - type: Tag id: MagazineLightRifle +- type: Tag + id: MagazineLightRifleBox + - type: Tag id: MagazineLightRiflePan