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

Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)

Browse Source 
*
This commit is contained in:
Mr. 27
2024-06-03 19:52:15 -04:00
committed by GitHub
parent 2ae5c953de
commit 7d22897d02
85 changed files with 729 additions and 1728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Station/Systems/StationSpawningSystem.cs
View File

@@ -179,13 +179,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId);
}
if (prototype?.StartingGear != null)
{
var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
}
// Run loadouts after so stuff like storage loadouts can get
var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID);
if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
@@ -203,6 +196,12 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
EquipRoleLoadout(entity.Value, loadout, roleProto);
}
if (prototype?.StartingGear != null)
{
var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
}
var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);
RaiseLocalEvent(entity.Value, ref gearEquippedEv);
@@ -309,4 +308,4 @@ public sealed class PlayerSpawningEvent : EntityEventArgs
HumanoidCharacterProfile = humanoidCharacterProfile;
Station = station;
}
}
}