diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs index 50dd03965a..aaf18d64d2 100644 --- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs +++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs @@ -45,12 +45,6 @@ public sealed class RandomHumanoidSystem : EntitySystem var speciesProto = _prototypeManager.Index(profile.Species); var humanoid = EntityManager.CreateEntityUninitialized(speciesProto.Prototype, coordinates); - if (speciesProto.StartingGear != null) - { - var startingGear = _prototypeManager.Index(speciesProto.StartingGear); - _stationSpawning.EquipStartingGear(humanoid, startingGear, raiseEvent: false); - } - _metaData.SetEntityName(humanoid, prototype.RandomizeName ? profile.Name : name); _humanoid.LoadProfile(humanoid, profile); diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 4484c76a77..aa2e0553fe 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -226,12 +226,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem EquipStartingGear(entity.Value, startingGear, raiseEvent: false); } - if (species.StartingGear != null) - { - var startingGear = _prototypeManager.Index(species.StartingGear); - EquipStartingGear(entity.Value, startingGear, raiseEvent: false); - } - var gearEquippedEv = new StartingGearEquippedEvent(entity.Value); RaiseLocalEvent(entity.Value, ref gearEquippedEv); diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index 83e1dec6d5..7c9203c524 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -134,9 +134,6 @@ public sealed partial class SpeciesPrototype : IPrototype /// [DataField] public int MaxAge = 120; - - [DataField] - public ProtoId? StartingGear; } public enum SpeciesNaming : byte diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index efa5b81cad..51bab91f08 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -13,7 +13,6 @@ naming: First sexes: - Unsexed - startingGear: VoxGear - type: speciesBaseSprites id: MobVoxSprites @@ -156,9 +155,3 @@ baseSprite: sprite: Mobs/Species/Vox/parts.rsi state: r_foot - -- type: startingGear - id: VoxGear - equipment: - mask: ClothingMaskBreath - pocket1: DoubleEmergencyNitrogenTankFilled