juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup gun containers (probably last time) (#8575)

Browse Source 
- snake_case instead of kebab-case
- Remove old MagazineBarrel containers
- Remove old event
This commit is contained in:
metalgearsloth
2022-06-02 00:37:55 +10:00
committed by GitHub
parent ffad61b751
commit 7f984792a1
21 changed files with 107 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs
View File

@@ -1,13 +0,0 @@
using Robust.Shared.Serialization;
namespace Content.Shared.Weapons.Ranged.Events
{
/// <summary>
/// This is sent if the MagazineBarrel AutoEjects the magazine
/// </summary>
[Serializable, NetSerializable]
public sealed class MagazineAutoEjectEvent : EntityEventArgs
{
public EntityUid Uid;
}
}

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
View File

@@ -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()
{

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
View File

@@ -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()
{

4
Resources/Maps/Salvage/asteroid-base.yml
View File

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

8
Resources/Maps/Salvage/stationstation.yml
View File

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

8
Resources/Maps/atlas.yml
View File

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

16
Resources/Maps/barratry.yml
View File

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

4
Resources/Maps/infiltrator.yml
View File

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

12
Resources/Maps/marathon.yml
View File

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

8
Resources/Maps/moose.yml
View File

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

16
Resources/Maps/nss_pillar.yml
View File

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

21
Resources/Maps/packedstation.yml
View File

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

15
Resources/Maps/packedstationxmas.yml
View File

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

4
Resources/Maps/saltern.yml
View File

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

20
Resources/Maps/splitstation.yml
View File

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

4
Resources/Maps/waystation.yml
View File

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

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View File

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

24
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View File

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

32
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

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

24
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

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

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View File

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