diff --git a/.github/labeler.yml b/.github/labeler.yml index 85843fa7b1a..8e0dd174920 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -21,7 +21,11 @@ - changed-files: - any-glob-to-any-file: '**/*.ftl' -"Changes: No C#": +"Changes: Audio": +- changed-files: + - any-glob-to-any-file: '**/*.ogg' + +"No C#": - changed-files: # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label. - all-globs-to-all-files: "!**/*.cs" diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs index 5bcf467ddb0..29ce0caf316 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -457,7 +457,21 @@ public EntityUid LoadProfileEntity(HumanoidCharacterProfile? humanoid, JobProtot { EntityUid dummyEnt; - if (humanoid is not null) + EntProtoId? previewEntity = null; + if (humanoid != null && jobClothes) + { + job ??= GetPreferredJob(humanoid); + + previewEntity = job.JobPreviewEntity ?? (EntProtoId?)job?.JobEntity; + } + + if (previewEntity != null) + { + // Special type like borg or AI, do not spawn a human just spawn the entity. + dummyEnt = EntityManager.SpawnEntity(previewEntity, MapCoordinates.Nullspace); + return dummyEnt; + } + else if (humanoid is not null) { var dummy = _prototypeManager.Index(humanoid.Species).DollPrototype; dummyEnt = EntityManager.SpawnEntity(dummy, MapCoordinates.Nullspace); @@ -471,7 +485,8 @@ public EntityUid LoadProfileEntity(HumanoidCharacterProfile? humanoid, JobProtot if (humanoid != null) { - job ??= GetPreferredJob(humanoid); + DebugTools.Assert(job != null); + GiveDummyJobClothes(dummyEnt, humanoid, job); if (_prototypeManager.HasIndex(LoadoutSystem.GetJobPrototype(job.ID))) diff --git a/Content.Client/Lobby/UI/CharacterPickerButton.xaml b/Content.Client/Lobby/UI/CharacterPickerButton.xaml index af1e640aadb..2edfd19a24e 100644 --- a/Content.Client/Lobby/UI/CharacterPickerButton.xaml +++ b/Content.Client/Lobby/UI/CharacterPickerButton.xaml @@ -6,6 +6,7 @@ SeparationOverride="0" Name="InternalHBox">