diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 53fad99b1a161..caad947fdd9a7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> ## Requirements - + - [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [ ] I have added media to this PR or it does not require an in-game showcase. diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs index abeed657323b0..d1a9f6f7a72a0 100644 --- a/Content.Client/Administration/AdminNameOverlay.cs +++ b/Content.Client/Administration/AdminNameOverlay.cs @@ -134,7 +134,7 @@ protected override void Draw(in OverlayDrawArgs args) ? null : _prototypeManager.Index(playerInfo.RoleProto.Value); - var roleName = Loc.GetString(rolePrototype?.Name ?? RoleTypePrototype.FallbackName); + var roleName = rolePrototype?.Name ?? RoleTypePrototype.FallbackName; var roleColor = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor; var roleSymbol = rolePrototype?.Symbol ?? RoleTypePrototype.FallbackSymbol; @@ -213,7 +213,7 @@ protected override void Draw(in OverlayDrawArgs args) { color = Color.GreenYellow; color.A = alpha; - args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? color : colorDisconnected); + args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.StartingJob, uiScale, playerInfo.Connected ? color : colorDisconnected); currentOffset += lineoffset; } @@ -241,7 +241,7 @@ protected override void Draw(in OverlayDrawArgs args) color = roleColor; symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty; text = IsFiltered(playerInfo.RoleProto) - ? roleName.ToUpper() + ? Loc.GetString(roleName).ToUpper() : string.Empty; break; case AdminOverlayAntagFormat.Subtype: diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs index a669a8da4c179..d0a9f5644cfac 100644 --- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs @@ -48,6 +48,10 @@ protected override void Open() (uint) _window.BottleDosage.Value, _window.LabelLine)); _window.BufferSortButton.OnPressed += _ => SendMessage( new ChemMasterSortingTypeCycleMessage()); + _window.OutputBufferDraw.OnPressed += _ => SendMessage( + new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.Internal)); + _window.OutputBeakerDraw.OnPressed += _ => SendMessage( + new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.External)); for (uint i = 0; i < _window.PillTypeButtons.Length; i++) { diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml index 5bc640ab44786..cc2a1991727a1 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml @@ -79,10 +79,13 @@ -