Merge branch 'master' into Asterisk1.1

DeltaV-Station · Nov 1, 2023 · d8b970f · d8b970f
2 parents 7f868fa + ce1c86d
commit d8b970f
Show file tree

Hide file tree

Showing 23 changed files with 33,183 additions and 31,021 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,12 +1,24 @@
-"Changes: Sprites":
-- '**/*.rsi/*.png'
+"Changes: C#":
+  - "**/*.cs"
+
+"Changes: Documentation":
+  - "**/*.xml"
+  - "**/*.md"
+
+"Changes: Localization":
+- 'Resources/Locale/**/*.ftl'
 
 "Changes: Map":
-- 'Resources/Maps/*.yml'
-- 'Resources/Prototypes/Maps/*.yml'
+  - "Resources/Maps/**/*.yml"
+  - "Resources/Prototypes/Maps/**/*.yml"
+
+"Changes: Sprite":
+  - "**/*.rsi/*.png"
+  - "**/*.rsi/*.json"
 
 "Changes: UI":
-- '**/*.xaml*'
+  - "**/*.xaml*"
 
-"No C#":
-- all: ["!**/*.cs"]
+"Changes: YML":
+  - any: ["**/*.yml"]
+    all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -14,6 +14,6 @@ jobs:
       - name: Check for Merge Conflicts
         uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
         with:
-          dirtyLabel: "Merge Conflict"
+          dirtyLabel: "Status: 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/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -5,9 +5,11 @@
     <LayoutContainer>
         <BoxContainer Name="VBox"
                       Orientation="Vertical"
-                      StyleIdentifier="mainMenuVBox">
+                      StyleIdentifier="mainMenuVBox"
+                      MinWidth="512">
             <TextureRect Name="Logo"
                          Stretch="KeepCentered" />
+            <Control MinSize="0 24" />
             <BoxContainer Orientation="Horizontal"
                           SeparationOverride="4">
                 <Label Text="{Loc 'main-menu-username-label'}" />

diff --git a/Content.Server/Labels/Label/HandLabelerSystem.cs b/Content.Server/Labels/Label/HandLabelerSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Labels;
+using Content.Shared.Tag;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -22,6 +23,10 @@ public sealed class HandLabelerSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly LabelSystem _labelSystem = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
+
+        [ValidatePrototypeId<TagPrototype>]
+        private const string PreventTag = "PreventLabel";
 
         public override void Initialize()
         {
@@ -35,7 +40,8 @@ public override void Initialize()
 
         private void OnUtilityVerb(EntityUid uid, HandLabelerComponent handLabeler, GetVerbsEvent<UtilityVerb> args)
         {
-            if (args.Target is not { Valid: true } target || !handLabeler.Whitelist.IsValid(target) || !args.CanAccess)
+            if (args.Target is not { Valid: true } target || !handLabeler.Whitelist.IsValid(target) || !args.CanAccess
+                || _tagSystem.HasTag(target, PreventTag)) // DeltaV - Prevent labels on certain items
                 return;
 
             string labelerText = handLabeler.AssignedLabel == string.Empty ? Loc.GetString("hand-labeler-remove-label-text") : Loc.GetString("hand-labeler-add-label-text");
@@ -56,7 +62,8 @@ private void OnUtilityVerb(EntityUid uid, HandLabelerComponent handLabeler, GetV
 
         private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
         {
-            if (args.Target is not {Valid: true} target || !handLabeler.Whitelist.IsValid(target) || !args.CanReach)
+            if (args.Target is not {Valid: true} target || !handLabeler.Whitelist.IsValid(target) || !args.CanReach
+                || _tagSystem.HasTag(target, PreventTag)) // DeltaV - Prevent labels on certain items
                 return;
 
             AddLabelTo(uid, handLabeler, target, out string? result);

diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Examine;
 using Content.Shared.Labels;
+using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -19,8 +20,11 @@ public sealed class LabelSystem : EntitySystem
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
+        [Dependency] private readonly TagSystem _tagSystem = default!;
 
         public const string ContainerName = "paper_label";
+        [ValidatePrototypeId<TagPrototype>]
+        private const string PreventTag = "PreventLabel";
 
         public override void Initialize()
         {
@@ -45,6 +49,8 @@ public void Label(EntityUid uid, string? text, MetaDataComponent? metadata = nul
         {
             if (!Resolve(uid, ref metadata))
                 return;
+            if (_tagSystem.HasTag(uid, PreventTag)) // DeltaV - Prevent labels on certain items
+                return;
             if (!Resolve(uid, ref label, false))
                 label = EnsureComp<LabelComponent>(uid);
 

diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Storage;
 using Content.Server.Storage.EntitySystems;
 using Content.Server.DoAfter;
+using Content.Shared.Tag;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Item.PseudoItem;
@@ -16,6 +17,11 @@ public sealed partial class PseudoItemSystem : EntitySystem
     [Dependency] private readonly StorageSystem _storageSystem = default!;
     [Dependency] private readonly ItemSystem _itemSystem = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
+
+    [ValidatePrototypeId<TagPrototype>]
+    private const string PreventTag = "PreventLabel";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -122,19 +128,19 @@ public bool TryInsert(EntityUid storageUid, EntityUid toInsert, PseudoItemCompon
             return false;
 
         var item = EnsureComp<ItemComponent>(toInsert);
+        _tagSystem.TryAddTag(toInsert, PreventTag);
         _itemSystem.SetSize(toInsert, component.Size, item);
 
         if (!_storageSystem.Insert(storageUid, toInsert, out _, null, storage))
         {
             component.Active = false;
             RemComp<ItemComponent>(toInsert);
             return false;
-        } else
-        {
-            component.Active = true;
-            Transform(storageUid).AttachToGridOrMap();
-            return true;
         }
+
+        component.Active = true;
+        Transform(storageUid).AttachToGridOrMap();
+        return true;
     }
     private void StartInsertDoAfter(EntityUid inserter, EntityUid toInsert, EntityUid storageEntity, PseudoItemComponent? pseudoItem = null)
     {

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -756,3 +756,9 @@ Entries:
       message: Asterisk station has been added to the game.
   id: 115
   time: '2023-11-01T16:32:48.0000000+00:00'
+- author: leonardo-dabepis
+  changes:
+    - type: Tweak
+      message: Switched logos around
+  id: 116
+  time: '2023-11-01T22:45:55.0000000+00:00'