Merge remote-tracking branch 'wizards/master' into upstream-sync

# Conflicts: # .github/labeler.yml # Content.Client/Lobby/UI/CharacterSetupGui.xaml # Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/ServerInfo/Guidebook/Science/Cyborgs.xml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json # Resources/Textures/Structures/Windows/mining.rsi/full.png # Resources/Textures/Structures/Windows/mining.rsi/meta.json # Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png # Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png # Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/plasma_window.rsi/full.png # Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png # Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png # Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png # Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png # Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/tinted_window.rsi/full.png # Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png # Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png # Resources/Textures/Structures/Windows/uranium_window.rsi/full.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png # Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png # Resources/Textures/Structures/Windows/window.rsi/full.png # Resources/Textures/Structures/Windows/window.rsi/meta.json # Resources/Textures/Structures/Windows/window.rsi/window0.png # Resources/Textures/Structures/Windows/window.rsi/window1.png # Resources/Textures/Structures/Windows/window.rsi/window2.png # Resources/Textures/Structures/Windows/window.rsi/window3.png # Resources/Textures/Structures/Windows/window.rsi/window4.png # Resources/Textures/Structures/Windows/window.rsi/window5.png # Resources/Textures/Structures/Windows/window.rsi/window6.png # Resources/Textures/Structures/Windows/window.rsi/window7.png # Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json # Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png # Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png # Resources/migration.yml
MureixloI · Nov 19, 2024 · fa377d8 · fa377d8
2 parents 3cc6e5b + 0e2e6a0
commit fa377d8
Show file tree

Hide file tree

Showing 364 changed files with 21,301 additions and 10,251 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -21,7 +21,7 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.ftl'
 
-"No C#":
+"Changes: 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/.github/workflows/conflict-labeler.yml → .github/workflows/labeler-conflict.yml b/.github/workflows/conflict-labeler.yml → .github/workflows/labeler-conflict.yml
@@ -16,6 +16,6 @@ jobs:
       - name: Check for Merge Conflicts
         uses: eps1lon/[email protected]
         with:
-          dirtyLabel: "Merge Conflict"
+          dirtyLabel: "S: Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
diff --git a/.github/workflows/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "Status: Needs Review"
+        labels: "S: Needs Review"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "Status: Awaiting Changes"
+        labels: "S: Awaiting Changes"
diff --git a/.github/workflows/labeler-size.yml b/.github/workflows/labeler-size.yml
@@ -0,0 +1,20 @@
+name: "Labels: Size"
+on: pull_request_target
+jobs:
+  size-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: size-label
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          # Custom size configuration
+          sizes: >
+            {
+              "0": "XS",
+              "10": "S",
+              "30": "M",
+              "100": "L",
+              "1000": "XL"
+            }
diff --git a/.github/workflows/labeler-stable.yml b/.github/workflows/labeler-stable.yml
@@ -0,0 +1,16 @@
+name: "Labels: Branch stable"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+    branches:
+      - 'stable'
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: "Branch: Stable"
diff --git a/.github/workflows/labeler-staging.yml b/.github/workflows/labeler-staging.yml
@@ -0,0 +1,16 @@
+name: "Labels: Branch staging"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+    branches:
+      - 'staging'
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: "Branch: Staging"
diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml
@@ -3,6 +3,8 @@
 on:
   issues:
     types: [opened]
+  pull_request_target:
+    types: [opened]
 
 jobs:
   add_label:
@@ -11,4 +13,4 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       if: join(github.event.issue.labels) == ''
       with:
-        labels: "Status: Untriaged"
+        labels: "S: Untriaged"
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml b/Content.Client/Administration/UI/Notes/NoteEdit.xaml
@@ -8,6 +8,7 @@
             <Label Name="ExpiryLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
             <HistoryLineEdit Name="ExpiryLineEdit" PlaceHolder="{Loc admin-note-editor-expiry-placeholder}"
                              Visible="False" HorizontalExpand="True" />
+            <OptionButton Name="ExpiryLengthDropdown" Visible="False" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <OptionButton Name="TypeOption" HorizontalAlignment="Center" />

diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -17,6 +17,17 @@ public sealed partial class NoteEdit : FancyWindow
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IClientConsoleHost _console = default!;
 
+    private enum Multipliers
+    {
+        Minutes,
+        Hours,
+        Days,
+        Weeks,
+        Months,
+        Years,
+        Centuries
+    }
+
     public event Action<int, NoteType, string, NoteSeverity?, bool, DateTime?>? SubmitPressed;
 
     public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool canEdit)
@@ -31,6 +42,20 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
 
         ResetSubmitButton();
 
+        // It's weird to use minutes as the IDs, but it works and makes sense kind of :)
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-minutes"), (int) Multipliers.Minutes);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-hours"), (int) Multipliers.Hours);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-days"), (int) Multipliers.Days);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-weeks"), (int) Multipliers.Weeks);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-months"), (int) Multipliers.Months);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-years"), (int) Multipliers.Years);
+        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-centuries"), (int) Multipliers.Centuries);
+        ExpiryLengthDropdown.OnItemSelected += OnLengthChanged;
+
+        ExpiryLengthDropdown.SelectId((int) Multipliers.Weeks);
+
+        ExpiryLineEdit.OnTextChanged += OnTextChanged;
+
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-note"), (int) NoteType.Note);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-message"), (int) NoteType.Message);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-watchlist"), (int) NoteType.Watchlist);
@@ -172,8 +197,9 @@ private void UpdatePermanentCheckboxFields()
     {
         ExpiryLabel.Visible = !PermanentCheckBox.Pressed;
         ExpiryLineEdit.Visible = !PermanentCheckBox.Pressed;
+        ExpiryLengthDropdown.Visible = !PermanentCheckBox.Pressed;
 
-        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
+        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? 1.ToString() : string.Empty;
     }
 
     private void OnSecretPressed(BaseButton.ButtonEventArgs _)
@@ -187,6 +213,16 @@ private void OnSeverityChanged(OptionButton.ItemSelectedEventArgs args)
         SeverityOption.SelectId(args.Id);
     }
 
+    private void OnLengthChanged(OptionButton.ItemSelectedEventArgs args)
+    {
+        ExpiryLengthDropdown.SelectId(args.Id);
+    }
+
+    private void OnTextChanged(HistoryLineEdit.LineEditEventArgs args)
+    {
+        ParseExpiryTime();
+    }
+
     private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs args)
     {
         if (!ParseExpiryTime())
@@ -263,13 +299,24 @@ private bool ParseExpiryTime()
             return true;
         }
 
-        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !DateTime.TryParse(ExpiryLineEdit.Text, out var result) || DateTime.UtcNow > result)
+        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !uint.TryParse(ExpiryLineEdit.Text, out var inputInt))
         {
             ExpiryLineEdit.ModulateSelfOverride = Color.Red;
             return false;
         }
 
-        ExpiryTime = result.ToUniversalTime();
+        var mult = ExpiryLengthDropdown.SelectedId switch
+        {
+            (int) Multipliers.Minutes => TimeSpan.FromMinutes(1).TotalMinutes,
+            (int) Multipliers.Hours => TimeSpan.FromHours(1).TotalMinutes,
+            (int) Multipliers.Days => TimeSpan.FromDays(1).TotalMinutes,
+            (int) Multipliers.Weeks => TimeSpan.FromDays(7).TotalMinutes,
+            (int) Multipliers.Months => TimeSpan.FromDays(30).TotalMinutes,
+            (int) Multipliers.Years => TimeSpan.FromDays(365).TotalMinutes,
+            (int) Multipliers.Centuries => TimeSpan.FromDays(36525).TotalMinutes,
+            _ => throw new ArgumentOutOfRangeException(nameof(ExpiryLengthDropdown.SelectedId), "Multiplier out of range :(")
+        };
+        ExpiryTime = DateTime.UtcNow.AddMinutes(inputInt * mult);
         ExpiryLineEdit.ModulateSelfOverride = null;
         return true;
     }

diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Client.Player;
+using Robust.Shared.GameStates;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -24,8 +25,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<AlertsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<AlertsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-
-        SubscribeLocalEvent<AlertsComponent, AfterAutoHandleStateEvent>(ClientAlertsHandleState);
+        SubscribeLocalEvent<AlertsComponent, ComponentHandleState>(OnHandleState);
     }
     protected override void LoadPrototypes()
     {
@@ -47,17 +47,22 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
         }
     }
 
-    protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
+    private void OnHandleState(Entity<AlertsComponent> alerts, ref ComponentHandleState args)
     {
+        if (args.Current is not AlertComponentState cast)
+            return;
+
+        alerts.Comp.Alerts = cast.Alerts;
+
         UpdateHud(alerts);
     }
 
-    protected override void AfterClearAlert(Entity<AlertsComponent> alerts)
+    protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
         UpdateHud(alerts);
     }
 
-    private void ClientAlertsHandleState(Entity<AlertsComponent> alerts, ref AfterAutoHandleStateEvent args)
+    protected override void AfterClearAlert(Entity<AlertsComponent> alerts)
     {
         UpdateHud(alerts);
     }

diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -58,6 +58,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
+        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -70,11 +71,7 @@ private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref
         if (args.Sprite == null)
             return;
 
-        var enumerator = _inventorySystem.GetSlotEnumerator((uid, component));
-        while (enumerator.NextItem(out var item, out var slot))
-        {
-            RenderEquipment(uid, item, slot.Name, component);
-        }
+        UpdateAllSlots(uid, component);
 
         // No clothing equipped -> make sure the layer is hidden, though this should already be handled by on-unequip.
         if (args.Sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var layer))
@@ -84,6 +81,23 @@ private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref
         }
     }
 
+    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
+    {
+        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
+    }
+
+    private void UpdateAllSlots(
+        EntityUid uid,
+        InventoryComponent? inventoryComponent = null,
+        ClothingComponent? clothing = null)
+    {
+        var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
+        while (enumerator.NextItem(out var item, out var slot))
+        {
+            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
+        }
+    }
+
     private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVisualsEvent args)
     {
         if (!TryComp(args.Equipee, out InventoryComponent? inventory))

diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -31,7 +31,7 @@ protected override void Open()
         private void PopulateCrayons()
         {
             var crayonDecals = _protoManager.EnumeratePrototypes<DecalPrototype>().Where(x => x.Tags.Contains("crayon"));
-            _menu?.Populate(crayonDecals);
+            _menu?.Populate(crayonDecals.ToList());
         }
 
         public override void OnProtoReload(PrototypesReloadedEventArgs args)
@@ -44,6 +44,16 @@ public override void OnProtoReload(PrototypesReloadedEventArgs args)
             PopulateCrayons();
         }
 
+        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        {
+            base.ReceiveMessage(message);
+
+            if (_menu is null || message is not CrayonUsedMessage crayonMessage)
+                return;
+
+            _menu.AdvanceState(crayonMessage.DrawnDecal);
+        }
+
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);

diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml b/Content.Client/Crayon/UI/CrayonWindow.xaml
@@ -1,14 +1,13 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'crayon-window-title'}"
-            MinSize="250 300"
-            SetSize="250 300">
+            MinSize="450 500"
+            SetSize="450 500">
     <BoxContainer Orientation="Vertical">
         <ColorSelectorSliders Name="ColorSelector" Visible="False" />
-        <LineEdit Name="Search" />
+        <LineEdit Name="Search" Margin="0 0 0 8" PlaceHolder="{Loc 'crayon-window-placeholder'}" />
         <ScrollContainer VerticalExpand="True">
-            <GridContainer Name="Grid" Columns="6">
-                <!-- Crayon decals get added here by code -->
-            </GridContainer>
+            <BoxContainer Name="Grids" Orientation="Vertical">
+            </BoxContainer>
         </ScrollContainer>
     </BoxContainer>
 </DefaultWindow>