diff --git a/Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs b/Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs deleted file mode 100644 index e20b36eea8..0000000000 --- a/Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Robust.Shared.Serialization; - -namespace Content.Shared.Weapons.Ranged.Events -{ - /// - /// This is sent if the MagazineBarrel AutoEjects the magazine - /// - [Serializable, NetSerializable] - public sealed class MagazineAutoEjectEvent : EntityEventArgs - { - public EntityUid Uid; - } -} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index 41be6f1ba4..54f0bdaa7c 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -11,7 +11,7 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem { - protected const string ChamberSlot = "gun-chamber"; + protected const string ChamberSlot = "gun_chamber"; protected virtual void InitializeChamberMagazine() { diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs index 5d5d1d3975..12279cc7b2 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem { - protected const string MagazineSlot = "gun-magazine"; + protected const string MagazineSlot = "gun_magazine"; protected virtual void InitializeMagazine() { diff --git a/Resources/Maps/Salvage/asteroid-base.yml b/Resources/Maps/Salvage/asteroid-base.yml index fd70235d61..1d6777944e 100644 --- a/Resources/Maps/Salvage/asteroid-base.yml +++ b/Resources/Maps/Salvage/asteroid-base.yml @@ -1683,8 +1683,8 @@ entities: - canCollide: False type: Physics - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 218 type: ContainerContainer - uid: 218 diff --git a/Resources/Maps/Salvage/stationstation.yml b/Resources/Maps/Salvage/stationstation.yml index d9e3f8be7d..c95bd6c0ad 100644 --- a/Resources/Maps/Salvage/stationstation.yml +++ b/Resources/Maps/Salvage/stationstation.yml @@ -3378,8 +3378,8 @@ entities: parent: 179 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot {} + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot {} type: ContainerContainer - uid: 436 type: WeaponSubMachineGunC20r @@ -3388,8 +3388,8 @@ entities: parent: 179 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot {} + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot {} type: ContainerContainer - uid: 437 type: WallSolid diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index dfe05a15f5..62063aa2bd 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -15359,8 +15359,8 @@ entities: parent: 30 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 871 type: ContainerContainer - uid: 871 @@ -15929,8 +15929,8 @@ entities: parent: 30 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 933 type: ContainerContainer - uid: 933 diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml index 43a4646ac6..af60857f30 100644 --- a/Resources/Maps/barratry.yml +++ b/Resources/Maps/barratry.yml @@ -52199,8 +52199,8 @@ entities: parent: 106 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 12219 type: ContainerContainer - uid: 4140 @@ -87921,8 +87921,8 @@ entities: parent: 106 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 7409 type: ContainerContainer - uid: 7420 @@ -88110,8 +88110,8 @@ entities: parent: 106 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 7441 type: ContainerContainer - uid: 7443 @@ -105860,8 +105860,8 @@ entities: parent: 106 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 9064 type: ContainerContainer - uid: 9105 diff --git a/Resources/Maps/infiltrator.yml b/Resources/Maps/infiltrator.yml index 3fc9b66fea..a59638ca81 100644 --- a/Resources/Maps/infiltrator.yml +++ b/Resources/Maps/infiltrator.yml @@ -7556,8 +7556,8 @@ entities: parent: 73 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 756 type: ContainerContainer - uid: 756 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 158b599f7c..23f966083d 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -36398,8 +36398,8 @@ entities: parent: 30 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 1990 type: ContainerContainer - canCollide: False @@ -36420,8 +36420,8 @@ entities: parent: 30 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 1992 type: ContainerContainer - canCollide: False @@ -36492,8 +36492,8 @@ entities: parent: 30 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 1999 type: ContainerContainer - canCollide: False diff --git a/Resources/Maps/moose.yml b/Resources/Maps/moose.yml index 60c43ab6db..1bf3c80bec 100644 --- a/Resources/Maps/moose.yml +++ b/Resources/Maps/moose.yml @@ -20143,8 +20143,8 @@ entities: parent: 61 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 1021 type: ContainerContainer - uid: 1021 @@ -94911,8 +94911,8 @@ entities: parent: 61 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 9109 type: ContainerContainer - uid: 9111 diff --git a/Resources/Maps/nss_pillar.yml b/Resources/Maps/nss_pillar.yml index eab21946c2..36ee41147b 100644 --- a/Resources/Maps/nss_pillar.yml +++ b/Resources/Maps/nss_pillar.yml @@ -63863,8 +63863,8 @@ entities: - canCollide: False type: Physics - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 878 type: ContainerContainer - uid: 4757 @@ -120485,8 +120485,8 @@ entities: - canCollide: False type: Physics - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 9839 type: ContainerContainer - uid: 9839 @@ -120505,8 +120505,8 @@ entities: - canCollide: False type: Physics - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 9841 type: ContainerContainer - uid: 9841 @@ -120677,8 +120677,8 @@ entities: parent: 130 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 9862 type: ContainerContainer - uid: 9862 diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index 435ed32af0..40608eb628 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -78797,11 +78797,8 @@ entities: - canCollide: False type: Physics - containers: - MagazineBarrel-chamber: !type:ContainerSlot {} - MagazineBarrel-magazine: !type:ContainerSlot - ent: 7532 - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 11936 type: ContainerContainer - uid: 7532 @@ -78820,11 +78817,8 @@ entities: - canCollide: False type: Physics - containers: - MagazineBarrel-chamber: !type:ContainerSlot {} - MagazineBarrel-magazine: !type:ContainerSlot - ent: 7534 - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 11937 type: ContainerContainer - uid: 7534 @@ -119653,11 +119647,8 @@ entities: - canCollide: False type: Physics - containers: - MagazineBarrel-chamber: !type:ContainerSlot {} - MagazineBarrel-magazine: !type:ContainerSlot - ent: 11142 - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 11938 type: ContainerContainer - uid: 11142 diff --git a/Resources/Maps/packedstationxmas.yml b/Resources/Maps/packedstationxmas.yml index 0189024986..065ec11f5b 100644 --- a/Resources/Maps/packedstationxmas.yml +++ b/Resources/Maps/packedstationxmas.yml @@ -77446,11 +77446,6 @@ entities: type: Transform - canCollide: False type: Physics - - containers: - MagazineBarrel-chamber: !type:ContainerSlot {} - MagazineBarrel-magazine: !type:ContainerSlot - ent: 7558 - type: ContainerContainer - uid: 7558 type: MagazineMagnumSubMachineGunRubber components: @@ -77470,11 +77465,6 @@ entities: type: Transform - canCollide: False type: Physics - - containers: - MagazineBarrel-chamber: !type:ContainerSlot {} - MagazineBarrel-magazine: !type:ContainerSlot - ent: 7560 - type: ContainerContainer - uid: 7560 type: MagazineMagnumSubMachineGunRubber components: @@ -114486,11 +114476,6 @@ entities: type: Transform - canCollide: False type: Physics - - containers: - MagazineBarrel-chamber: !type:ContainerSlot {} - MagazineBarrel-magazine: !type:ContainerSlot - ent: 11180 - type: ContainerContainer - uid: 11180 type: MagazinePistolSubMachineGunTopMounted components: diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 75f3c92978..61fc1c0a69 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -19634,8 +19634,8 @@ entities: parent: 852 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 5157 type: ContainerContainer - canCollide: False diff --git a/Resources/Maps/splitstation.yml b/Resources/Maps/splitstation.yml index 96c141342d..90065fc806 100644 --- a/Resources/Maps/splitstation.yml +++ b/Resources/Maps/splitstation.yml @@ -119808,8 +119808,8 @@ entities: parent: 69 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 10673 type: ContainerContainer - uid: 10673 @@ -119826,8 +119826,8 @@ entities: parent: 69 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 10675 type: ContainerContainer - uid: 10675 @@ -127797,8 +127797,8 @@ entities: parent: 69 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 11573 type: ContainerContainer - uid: 11573 @@ -127815,8 +127815,8 @@ entities: parent: 69 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 11575 type: ContainerContainer - uid: 11575 @@ -233409,8 +233409,8 @@ entities: parent: 69 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 21964 type: ContainerContainer - uid: 21964 diff --git a/Resources/Maps/waystation.yml b/Resources/Maps/waystation.yml index 99dad204a7..5cf01265f5 100644 --- a/Resources/Maps/waystation.yml +++ b/Resources/Maps/waystation.yml @@ -26604,8 +26604,8 @@ entities: parent: 82 type: Transform - containers: - gun-chamber: !type:ContainerSlot {} - gun-magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot {} + gun_magazine: !type:ContainerSlot ent: 1443 type: ContainerContainer - uid: 1445 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index a06d92e8cf..26c8f4e15d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -21,7 +21,7 @@ - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineBoxLightRifle insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg @@ -29,7 +29,7 @@ whitelist: tags: - MagazineBoxLightRifle - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeLightRifle whitelist: @@ -37,8 +37,8 @@ - CartridgeLightRifle - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: entity name: L6 SAW diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 78eadfa523..4025377357 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -24,7 +24,7 @@ - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazinePistol insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg @@ -32,7 +32,7 @@ whitelist: tags: - MagazinePistol - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgePistol whitelist: @@ -40,8 +40,8 @@ - CartridgePistol - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: Appearance visuals: - type: MagVisualizer @@ -62,7 +62,7 @@ sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazinePistol insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg @@ -71,7 +71,7 @@ tags: - MagazinePistol - MagazinePistolHighCapacity - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgePistol whitelist: @@ -79,8 +79,8 @@ - CartridgePistol - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: entity name: handmade pistol @@ -122,7 +122,7 @@ path: /Audio/Weapons/Guns/Gunshots/silenced.ogg - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazinePistolCaselessRifle insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg @@ -130,7 +130,7 @@ whitelist: tags: - MagazinePistolCaselessRifle - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeCaselessRifle whitelist: @@ -138,8 +138,8 @@ - CartridgeCaselessRifle - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: entity name: mk 58 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 101cc3b79d..25620c38fe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -20,7 +20,7 @@ - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineLightRifle insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg @@ -28,7 +28,7 @@ whitelist: tags: - MagazineLightRifle - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeLightRifle whitelist: @@ -36,8 +36,8 @@ - CartridgeLightRifle - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: entity name: AKMS @@ -62,7 +62,7 @@ - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineLightRifle insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg @@ -70,7 +70,7 @@ whitelist: tags: - MagazineLightRifle - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeLightRifle whitelist: @@ -78,8 +78,8 @@ - CartridgeLightRifle - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: Appearance visuals: - type: MagVisualizer @@ -105,7 +105,7 @@ sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineRifle insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg @@ -113,7 +113,7 @@ whitelist: tags: - MagazineRifle - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeRifle whitelist: @@ -121,8 +121,8 @@ - CartridgeRifle - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: Appearance visuals: - type: MagVisualizer @@ -151,7 +151,7 @@ path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineRifle insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg @@ -159,7 +159,7 @@ whitelist: tags: - MagazineRifle - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeRifle whitelist: @@ -167,8 +167,8 @@ - CartridgeRifle - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: Appearance visuals: - type: MagVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 4de10a42d1..707b35321c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -21,7 +21,7 @@ - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazinePistolSubMachineGun insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg @@ -29,7 +29,7 @@ whitelist: tags: - MagazinePistolSubMachineGun - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgePistol whitelist: @@ -37,8 +37,8 @@ - CartridgePistol - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: entity name: Atreides @@ -114,7 +114,7 @@ - FullAuto - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineMagnumSubMachineGun insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg @@ -122,7 +122,7 @@ whitelist: tags: - MagazineMagnumSubMachineGun - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeMagnum whitelist: @@ -130,8 +130,8 @@ - CartridgeMagnum - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: Appearance visuals: - type: MagVisualizer @@ -182,7 +182,7 @@ components: - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineMagnumSubMachineGunRubber insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg @@ -190,7 +190,7 @@ whitelist: tags: - MagazineMagnumSubMachineGun - gun-chamber: + gun_chamber: name: Chamber startingItem: CartridgeMagnumRubber whitelist: @@ -198,5 +198,5 @@ - CartridgeMagnum - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 0f9088c730..dd2901dced 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -61,7 +61,7 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg - type: ItemSlots slots: - gun-magazine: + gun_magazine: name: Magazine startingItem: MagazineShotgun whitelist: @@ -71,8 +71,8 @@ ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: ContainerContainer containers: - gun-magazine: !type:ContainerSlot - gun-chamber: !type:ContainerSlot + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot - type: MagazineAmmoProvider - type: Appearance visuals: