diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs index ff95d1eeff5..962bc8b2fa1 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs @@ -31,7 +31,7 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow private string? _lastJobProto; // The job that will be picked if the ID doesn't have a job on the station. - private static ProtoId _defaultJob = "SCPClassD"; // Foundation-14 + private static ProtoId _defaultJob = "JobSCPClassD"; // Foundation-14 public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager, List> accessLevels) diff --git a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs index 823d3e532b4..c199e022579 100644 --- a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs +++ b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs @@ -102,10 +102,12 @@ FormattedMessage GetLoc(string fluentId, params (string,object)[] args) "wanted-list-job-label", ("job", record.TargetInfo.JobTitle.ToLower()) )); + /* SCP-Foundation : Human only TargetSpecies.SetMessage(GetLoc( "wanted-list-species-label", ("species", record.TargetInfo.Species.ToLower()) )); + */ TargetGender.SetMessage(GetLoc( "wanted-list-gender-label", ("gender", record.TargetInfo.Gender) diff --git a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml index 7b5d116ad74..b1608b168ed 100644 --- a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml +++ b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.xaml @@ -36,7 +36,9 @@ + diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs index 38eb6916895..21a7bf9f06c 100644 --- a/Content.Client/Doors/AirlockSystem.cs +++ b/Content.Client/Doors/AirlockSystem.cs @@ -103,6 +103,7 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear || state == DoorState.Opening || state == DoorState.Denying || (state == DoorState.Open && comp.OpenUnlitVisible) + || (state == DoorState.Closed && comp.OpenUnlitVisible) // SCP-Foundation || (_appearanceSystem.TryGetData(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights)) && !boltedVisible && !emergencyLightsVisible; } diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs index ddc9752b1ed..0afbe99e9f9 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs @@ -20,6 +20,7 @@ public sealed partial class HumanoidProfileEditor public void UpdateSpeciesGuidebookIcon() { + /* SCP-Foundtion : Human only SpeciesInfoButton.StyleClasses.Clear(); var species = Profile?.Species; @@ -35,6 +36,7 @@ public void UpdateSpeciesGuidebookIcon() const string style = "SpeciesInfoDefault"; SpeciesInfoButton.StyleIdentifier = style; + */ } private void UpdateGenderControls() @@ -134,6 +136,7 @@ private void UpdateSkinColor() } } + /* SCP-Foundation private void UpdateSpawnPriorityControls() { if (Profile == null) @@ -143,12 +146,14 @@ private void UpdateSpawnPriorityControls() SpawnPriorityButton.SelectId((int)Profile.SpawnPriority); } + */ /// /// Refreshes the species selector. /// public void RefreshSpecies() { + /* SCP-Foundation : Human only SpeciesButton.Clear(); _species.Clear(); @@ -175,6 +180,7 @@ public void RefreshSpecies() SetSpecies(HumanoidCharacterProfile.DefaultSpecies); } } + */ } private void SetSpecies(string newSpecies) diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml index 84c5b75d1cb..c8e35f44cc8 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml @@ -54,6 +54,7 @@ +