From b7c088fbf36304c41a8c8944bf9f561877487afc Mon Sep 17 00:00:00 2001 From: Alex Evgrashin Date: Sat, 22 Jun 2024 03:11:40 +0200 Subject: [PATCH 001/166] Fix SSD indicator for scaled humanoids (#29310) Fix ssd --- Resources/Textures/Effects/ssd.rsi/default0.png | Bin 200 -> 524 bytes Resources/Textures/Effects/ssd.rsi/meta.json | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Effects/ssd.rsi/default0.png b/Resources/Textures/Effects/ssd.rsi/default0.png index bfd8c84da99a874861d8ef47b8c7f4891adf1901..962a7298cf390486a7cce55807e8f7f37876500c 100644 GIT binary patch literal 524 zcmV+n0`vWeP)EX>4Tx04R}tkv&MmKpe$iQ?()$2ZM+>1gS3CMMWG-6^me@v=v%)FuC+YXws0h zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOiqYdvy6CZAq~&*bq^n3@4`IG``n+SSIt=r@JYlGW|$S?b>f-L ziotoGSY$<6B|ayfFzJHCk6c$=e&bwlSm2qWnNH3Ti^Ni)jg>ZLMN=c5CJw2ZPWeK{ zWtH<5XRTCa&3p0}26Osyit99o5yK+lNI-&uDmG9;1z}osQY<8CKkDHha{LK$DdgG! zBgZ_-&>%a0@IUz7t(Bjebd!Qnp!3DHKSqJTF3_mi_V=-EH%AO zrG<`wzHQ**x}_<5z~v4w_+-eY>_~o^LOu_?pV2pEf&N>dXVvYkxsTHaAWdB@-2exN zz*vE@*F4_c-QL^3XPW)}0QMVl+o@b*A z>^!DBKmq|yP!a%h<49Aq65s$tU$QTJ<}4w~JlQVuEQ>bs_seLnM@=j)VGN}B{OCvk O0000sCu*ji*FV&-O}tMesBGd6M!n}jZ6ZublGDZCDc)yD?mBLf-*DNVMd9WF+a~{y ooB{uYtC&5K8W`Cm5}<^1V+enV!Z diff --git a/Resources/Textures/Effects/ssd.rsi/meta.json b/Resources/Textures/Effects/ssd.rsi/meta.json index 6c5e7b24e3..6e9db0d8de 100644 --- a/Resources/Textures/Effects/ssd.rsi/meta.json +++ b/Resources/Textures/Effects/ssd.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Take from https://github.com/Skyrat-SS13/Skyrat-tg/blob/92377cd6203bc4d93a6e289d7b857e19bb6cf338/modular_skyrat/modules/indicators/icons/ssd_indicator.dmi", + "copyright": "Take from https://github.com/Skyrat-SS13/Skyrat-tg/blob/92377cd6203bc4d93a6e289d7b857e19bb6cf338/modular_skyrat/modules/indicators/icons/ssd_indicator.dmi and changed by Macoron", "size": { - "x": 32, - "y": 32 + "x": 8, + "y": 8 }, "states": [ { From 0ff144af73ffc9e58ddb56c1460da72c7a1f9cb1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 22 Jun 2024 01:12:48 +0000 Subject: [PATCH 002/166] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 68ccd7a6d4..a209fdd1da 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Tayrtahn - changes: - - message: Some devices may have broken wiring at the start of each round. - type: Add - id: 6299 - time: '2024-04-04T06:28:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26695 - author: lzk228 changes: - message: Turning off thrusters and gyroscopes now stop consume power. @@ -3850,3 +3843,10 @@ id: 6798 time: '2024-06-21T10:50:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29293 +- author: Macoron + changes: + - message: Fixed SSD indicator for dwarfs. + type: Fix + id: 6799 + time: '2024-06-22T01:11:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29310 From 6aa7e2edce0d983d0e927896ac4ee41d7045c888 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Sat, 22 Jun 2024 04:45:33 +0300 Subject: [PATCH 003/166] Fix noticeboard drawdepth (#29262) darwdepth added --- .../Prototypes/Entities/Structures/Wallmounts/noticeboard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml index f2315583e3..2da4fbc3c4 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml @@ -7,6 +7,7 @@ components: - type: WallMount - type: Sprite + drawdepth: WallMountedItems sprite: Structures/Wallmounts/noticeboard.rsi layers: - state: noticeboard From e0a6604d062a5de3e20be3cbd5d845bc0cd675f2 Mon Sep 17 00:00:00 2001 From: Doomsdrayk Date: Fri, 21 Jun 2024 19:46:51 -0600 Subject: [PATCH 004/166] Fix pistols not displaying ammo count in-hand (#29289) * Make Drozd and C-20r not unwield on use * Fix wielding mispredict * add AmmoCounter to pistols --- .../Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index f3a8215e3d..ae309661fe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -58,6 +58,7 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot + - type: AmmoCounter - type: MagazineVisuals magState: mag steps: 1 From 07fe1a6b5a0724a266e99781f697f423fe2badd5 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 22 Jun 2024 06:11:14 +0200 Subject: [PATCH 005/166] Rewrite the options menu (#28389) * Basic attempt at rewriting how the options menu works, move accessibility settings into their own tab. * Audio tab uses the new options system. * Rewrite Misc tab * Clean up heading styling * Rewrite options tab and other minor cleanup all over the place. * Documentation comments and minor cleanup. --------- Co-authored-by: AJCM Co-authored-by: metalgearsloth --- Content.Client/Options/UI/OptionDropDown.xaml | 6 + .../Options/UI/OptionDropDown.xaml.cs | 21 + Content.Client/Options/UI/OptionSlider.xaml | 7 + .../Options/UI/OptionSlider.xaml.cs | 22 + Content.Client/Options/UI/OptionsMenu.xaml | 1 + Content.Client/Options/UI/OptionsMenu.xaml.cs | 9 +- .../Options/UI/OptionsTabControlRow.xaml | 18 + .../Options/UI/OptionsTabControlRow.xaml.cs | 684 ++++++++++++++++++ .../Options/UI/Tabs/AccessibilityTab.xaml | 16 + .../Options/UI/Tabs/AccessibilityTab.xaml.cs | 24 + Content.Client/Options/UI/Tabs/AudioTab.xaml | 124 +--- .../Options/UI/Tabs/AudioTab.xaml.cs | 230 ++---- .../Options/UI/Tabs/GraphicsTab.xaml | 79 +- .../Options/UI/Tabs/GraphicsTab.xaml.cs | 398 +++++----- Content.Client/Options/UI/Tabs/MiscTab.xaml | 54 +- .../Options/UI/Tabs/MiscTab.xaml.cs | 213 +----- .../en-US/escape-menu/ui/options-menu.ftl | 36 +- 17 files changed, 1141 insertions(+), 801 deletions(-) create mode 100644 Content.Client/Options/UI/OptionDropDown.xaml create mode 100644 Content.Client/Options/UI/OptionDropDown.xaml.cs create mode 100644 Content.Client/Options/UI/OptionSlider.xaml create mode 100644 Content.Client/Options/UI/OptionSlider.xaml.cs create mode 100644 Content.Client/Options/UI/OptionsTabControlRow.xaml create mode 100644 Content.Client/Options/UI/OptionsTabControlRow.xaml.cs create mode 100644 Content.Client/Options/UI/Tabs/AccessibilityTab.xaml create mode 100644 Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs diff --git a/Content.Client/Options/UI/OptionDropDown.xaml b/Content.Client/Options/UI/OptionDropDown.xaml new file mode 100644 index 0000000000..58dcdca6c8 --- /dev/null +++ b/Content.Client/Options/UI/OptionDropDown.xaml @@ -0,0 +1,6 @@ + + + + diff --git a/Content.Client/Options/UI/OptionDropDown.xaml.cs b/Content.Client/Options/UI/OptionDropDown.xaml.cs new file mode 100644 index 0000000000..506e241a06 --- /dev/null +++ b/Content.Client/Options/UI/OptionDropDown.xaml.cs @@ -0,0 +1,21 @@ +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface; + +namespace Content.Client.Options.UI; + +/// +/// Standard UI control used for drop-downs in the options menu. Intended for use with . +/// +/// +[GenerateTypedNameReferences] +public sealed partial class OptionDropDown : Control +{ + /// + /// The text describing what this drop-down controls. + /// + public string? Title + { + get => NameLabel.Text; + set => NameLabel.Text = value; + } +} diff --git a/Content.Client/Options/UI/OptionSlider.xaml b/Content.Client/Options/UI/OptionSlider.xaml new file mode 100644 index 0000000000..fa2d78c67f --- /dev/null +++ b/Content.Client/Options/UI/OptionSlider.xaml @@ -0,0 +1,7 @@ + + + + diff --git a/Content.Client/Options/UI/OptionSlider.xaml.cs b/Content.Client/Options/UI/OptionSlider.xaml.cs new file mode 100644 index 0000000000..6a377f7ee1 --- /dev/null +++ b/Content.Client/Options/UI/OptionSlider.xaml.cs @@ -0,0 +1,22 @@ +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface; + +namespace Content.Client.Options.UI; + +/// +/// Standard UI control used for sliders in the options menu. Intended for use with . +/// +/// +/// +[GenerateTypedNameReferences] +public sealed partial class OptionSlider : Control +{ + /// + /// The text describing what this slider controls. + /// + public string? Title + { + get => NameLabel.Text; + set => NameLabel.Text = value; + } +} diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml index 4f624c1bb6..90486a196a 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml +++ b/Content.Client/Options/UI/OptionsMenu.xaml @@ -7,5 +7,6 @@ + diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs index 35a3f751bb..61037f4e4a 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml.cs +++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs @@ -1,9 +1,6 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.IoC; -using Content.Client.Options.UI.Tabs; - namespace Content.Client.Options.UI { @@ -19,13 +16,17 @@ namespace Content.Client.Options.UI Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics")); Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls")); Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio")); + Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility")); UpdateTabs(); } public void UpdateTabs() { - GraphicsTab.UpdateProperties(); + GraphicsTab.Control.ReloadValues(); + MiscTab.Control.ReloadValues(); + AccessibilityTab.Control.ReloadValues(); + AudioTab.Control.ReloadValues(); } } } diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml b/Content.Client/Options/UI/OptionsTabControlRow.xaml new file mode 100644 index 0000000000..fafdee4df7 --- /dev/null +++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml @@ -0,0 +1,18 @@ + + + + + diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml index 4a1719cbf8..a7c4c35494 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml @@ -1,11 +1,11 @@  + xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add}"> - -