Old sandwich tiles [oops, that was a accident. Ignore this]

.github/CODEOWNERS

@@ -1,45 +1,18 @@
-# Last match in file takes precedence.
-
-# Sorting by path instead of by who added it one day :(
-# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-
-#/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr @crazybrain23
-#/Content.*/Administration/ @DrSmugleaf @nikthechampiongr @crazybrain23
-#/Resources/ServerInfo/ @nikthechampiongr @crazybrain23
-#/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr @crazybrain23
-
-#/Resources/Prototypes/Maps/** @Emisse
-
-#/Resources/Prototypes/Body/ @DrSmugleaf # suffering
-#/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
-#/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-#/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr @crazybrain23
-#/Content.*/Body/ @DrSmugleaf
-#/Content.YAMLLinter @DrSmugleaf
-#/Content.Shared/Damage/ @DrSmugleaf
-
-#/Content.*/Anomaly/ @TheShuEd
-#/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @TheShuEd
-
-#/Content.*/Forensics/ @ficcialfaint
-
-# SKREEEE
-#/Content.*.Database/ @PJB3005 @DrSmugleaf
-#/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr @crazybrain23
-#/Pow3r/ @PJB3005
-#/Content.Server/Power/Pow3r/ @PJB3005
-
-# notafet
-#/Content.*/Atmos/ @Partmedia
-#/Content.*/Botany/ @Partmedia
-
-# Jezi
-#/Content.*/Medical @Jezithyr
-#/Content.*/Body @Jezithyr
-
-# Sloth
-#/Content.*/Audio @metalgearsloth
-#/Content.*/Movement @metalgearsloth
-#/Content.*/NPC @metalgearsloth
-#/Content.*/Shuttles @metalgearsloth
-#/Content.*/Weapons @metalgearsloth
+# Warning: Inverted order, last one in file takes priority!
+
+# code changes will send PR to following users
+* @SandwichStation/pr-reviewers
+
+# Only allow CentComm Admirals to edit these files/folders:
+/LICENSES/* @SandwichStation/centcomm-admiral # We dont want legal trouble because a missing license
+/RobustToolbox/* @SandwichStation/centcomm-admiral # We dont want random bugs due to version updates
+/.github/* @SandwichStation/centcomm-admiral # important folder
+/SECURITY.md @SandwichStation/centcomm-admiral # Sensitive data, strict rules
+/README.md @SandwichStation/centcomm-admiral # Our public message, no random changes permitted
+*.bat @SandwichStation/centcomm-admiral # Since everyone will be running these, stricter rules
+*.sh @SandwichStation/centcomm-admiral # Since everyone will be running these, stricter rules
+/Scripts/* @SandwichStation/centcomm-admiral # Since everyone will be running these, stricter rules
+/Tools/* @SandwichStation/centcomm-admiral # Normal users have no reason to mess with these files
+
+# Only allow permission changes by SandwichStation Owner
+/.github/CODEOWNERS @B3CKDOOR

.github/FUNDING.yml

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 Piras314 <p1r4s@proton.me>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# These are supported funding model platforms
+
+github: [SandwichStation, B3CKDOOR] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: 'https://discord.gg/SandwichStation' # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,5 @@
-
-
 ## About the PR
 <!-- What did you change? -->
-<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
 
 ## Why / Balance
 <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. -->
@@ -14,9 +11,18 @@
 <!-- Describe a procedure to test this feature, along with expected output/behavior. -->
 
 ## Media
-<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). 
+<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc).
 Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
 
+## Requirements
+<!-- Confirm the following by placing an X in the brackets [X]: -->
+- [ ] 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 ingame showcase.
+- Either:
+- [ ] I have given credit the right people in the right [attributions.yml (example)](https://github.com/SandwichStation/SandwichStation-HL/blob/master/Resources/Audio/_ShibaStation/Lobby/attributions.yml) file
+- [ ] I own the rights to the added content
+<!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
+
 ## Breaking changes
 <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. -->
 

Content.Client/Entry/EntryPoint.cs

@@ -1,4 +1,3 @@
-using Content.Client._Common.Consent; // Consent system
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -44,7 +43,6 @@ namespace Content.Client.Entry
 {
     public sealed class EntryPoint : GameClient
     {
-        [Dependency] private readonly IClientConsentManager _clientConsentManager = default!; // Consent system
         [Dependency] private readonly IBaseClient _baseClient = default!;
         [Dependency] private readonly IGameController _gameController = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
@@ -172,7 +170,6 @@ public override void PostInit()
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
             _overlayManager.AddOverlay(new EmpBlastOverlay()); // Frontier
             _chatManager.Initialize();
-            _clientConsentManager.Initialize(); // Floofstation
             _clientPreferencesManager.Initialize();
             _euiManager.Initialize();
             _voteManager.Initialize();

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -1,6 +1,4 @@
 using System.Numerics;
-using Content.Client._Common.Consent;
-using Content.Shared._Common.Consent;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
@@ -17,19 +15,14 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
-    [Dependency] private readonly IClientConsentManager _consentManager = default!; // Hardlight
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
-    private static readonly ProtoId<ConsentTogglePrototype> GenitalMarkingsConsent = "GenitalMarkings"; // Hardlight
-
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<HumanoidAppearanceComponent, AfterAutoHandleStateEvent>(OnHandleState);
         SubscribeLocalEvent<HumanoidAppearanceComponent, AppearanceChangeEvent>(OnAppearanceChange);
-
-        _consentManager.OnServerDataLoaded += OnConsentChanged;
     }
 
     private void OnHandleState(EntityUid uid, HumanoidAppearanceComponent component, ref AfterAutoHandleStateEvent args)
@@ -73,15 +66,6 @@ private void OnAppearanceChange(EntityUid uid, HumanoidAppearanceComponent comp,
         }
     }
 
-    private void OnConsentChanged()
-    {
-        var humanoidQuery = EntityManager.AllEntityQueryEnumerator<HumanoidAppearanceComponent, SpriteComponent>();
-        while (humanoidQuery.MoveNext(out var owner, out var humanoid, out var sprite))
-        {
-            UpdateSprite(owner, humanoid, sprite);
-        }
-    }
-
     private static bool IsHidden(HumanoidAppearanceComponent humanoid, HumanoidVisualLayers layer)
         => humanoid.HiddenLayers.ContainsKey(layer) || humanoid.PermanentlyHidden.Contains(layer);
 
@@ -338,7 +322,7 @@ private void AddUndergarments(EntityUid uid, HumanoidAppearanceComponent humanoi
             if (_markingManager.TryGetMarking(marking, out var prototype))
             {
                 // Markings are added to ClientOldMarkings because otherwise it causes issues when toggling the feature on/off.
-                humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentTop, new List<Marking>{ marking });
+                humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentTop, new List<Marking> { marking });
                 ApplyMarking(uid, prototype, null, false, true, humanoid, sprite); //starlight, glowing
             }
         }
@@ -348,7 +332,7 @@ private void AddUndergarments(EntityUid uid, HumanoidAppearanceComponent humanoi
             var marking = new Marking(humanoid.UndergarmentBottom, new List<Color> { new Color() }, false); //starlight, glowing
             if (_markingManager.TryGetMarking(marking, out var prototype))
             {
-                humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentBottom, new List<Marking>{ marking });
+                humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentBottom, new List<Marking> { marking });
                 ApplyMarking(uid, prototype, null, false, true, humanoid, sprite); //starlight, glowing
             }
         }
@@ -403,12 +387,6 @@ private void ApplyMarking(EntityUid uid, MarkingPrototype markingPrototype,
         visible &= !humanoid.HiddenMarkings.Contains(markingPrototype.ID); // FLOOF ADD
         // FLOOF ADD END
 
-        // Hardlight: genital markings consent toggle
-        if (!(_consentManager.GetConsentSettings().Toggles.TryGetValue(GenitalMarkingsConsent, out var val) && val == "on"))
-        {
-            visible &= markingPrototype.MarkingCategory != MarkingCategories.Genital;
-        }
-
         for (var j = 0; j < markingPrototype.Sprites.Count; j++)
         {
             var markingSprite = markingPrototype.Sprites[j];
@@ -452,7 +430,7 @@ private void ApplyMarking(EntityUid uid, MarkingPrototype markingPrototype,
             var layerId = $"{markingPrototype.ID}-{rsi.RsiState}";
             // FLOOF CHANGE END
 
-            if (!_sprite.LayerMapTryGet((uid, sprite), layerId, out _ , false))
+            if (!_sprite.LayerMapTryGet((uid, sprite), layerId, out _, false))
             {
                 // for layers that are supposed to be behind everything,
                 // adding 1 to the layer index makes it not be behind
@@ -493,21 +471,21 @@ private void ApplyMarking(EntityUid uid, MarkingPrototype markingPrototype,
             // }
 
             // Starlight start, # HardLight: Not really sure why it broke, but it had to be rewritten to work again, so here we are.
-                if (isGlowing)
-                {
-                    sprite.LayerSetShader(layerId, SpriteSystem.UnshadedId.Id);
-                }
-                else if (!string.IsNullOrWhiteSpace(markingPrototype.Shader))
-                {
-                    sprite.LayerSetShader(layerId, markingPrototype.Shader);
-                }
-                else
+            if (isGlowing)
+            {
+                sprite.LayerSetShader(layerId, SpriteSystem.UnshadedId.Id);
+            }
+            else if (!string.IsNullOrWhiteSpace(markingPrototype.Shader))
+            {
+                sprite.LayerSetShader(layerId, markingPrototype.Shader);
+            }
+            else
+            {
+                if (_sprite.LayerMapTryGet((uid, sprite), layerId, out var shaderLayerIndex, false))
                 {
-                    if (_sprite.LayerMapTryGet((uid, sprite), layerId, out var shaderLayerIndex, false))
-                    {
-                        sprite.LayerSetShader(shaderLayerIndex, null, null);
-                    }
+                    sprite.LayerSetShader(shaderLayerIndex, null, null);
                 }
+            }
             // Starlight end
         }
     }

Content.Client/IoC/ClientContentIoC.cs

@@ -1,4 +1,3 @@
-using Content.Client._Common.Consent; // Consent system
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -38,7 +37,6 @@ public static void Register()
 
             collection.Register<IParallaxManager, ParallaxManager>();
             collection.Register<IChatManager, ChatManager>();
-            collection.Register<IClientConsentManager, ClientConsentManager>(); // Consent system
             collection.Register<ISharedChatManager, ChatManager>();
             collection.Register<IClientPreferencesManager, ClientPreferencesManager>();
             collection.Register<IStylesheetManager, StylesheetManager>();

Content.Client/MainMenu/UI/MainMenuControl.xaml.cs

@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -22,7 +22,7 @@ public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
         LayoutContainer.SetMarginTop(VBox, 30);
         LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Begin);
 
-        var logoTexture = resCache.GetResource<TextureResource>("/Textures/_NF/Logo/logo.png"); // Frontier: add _NF
+        var logoTexture = resCache.GetResource<TextureResource>("/Textures/_Sandwich/Logo/logo.png");
         Logo.Texture = logoTexture;
 
         var currentUserName = configMan.GetCVar(CVars.PlayerName);

Content.Client/Stylesheets/StyleNano.cs

@@ -1646,7 +1646,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")),
 
                 Element<TextureRect>().Class("PirateLogoDark") // Frontier
-                    .Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/_NF/Interface/Pirate/piratelogo.png")) // Frontier
+                    .Prop(TextureRect.StylePropertyTexture, resCache.GetTexture("/Textures/_Sandwich/Interface/Pirate/piratelogo.png")) // Sandwich
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")), // Frontier
 
                 Element<Label>().Class("WindowFooterText")

Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs

@@ -1,4 +1,3 @@
-using Content.Client._Common.Consent.UI; // Consent system
 using Content.Client.UserInterface.Systems.Actions;
 using Content.Client.UserInterface.Systems.Admin;
 using Content.Client.UserInterface.Systems.Bwoink;
@@ -25,7 +24,6 @@ public sealed class GameTopMenuBarUIController : UIController
     [Dependency] private readonly SandboxUIController _sandbox = default!;
     [Dependency] private readonly GuidebookUIController _guidebook = default!;
     [Dependency] private readonly EmotesUIController _emotes = default!;
-    [Dependency] private readonly ConsentUiController _consent = default!; // Consent system
 
     private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
 
@@ -49,7 +47,6 @@ public void UnloadButtons()
         _action.UnloadButton();
         _sandbox.UnloadButton();
         _emotes.UnloadButton();
-        _consent.UnloadButton(); // Consent system
     }
 
     public void LoadButtons()
@@ -63,6 +60,5 @@ public void LoadButtons()
         _action.LoadButton();
         _sandbox.LoadButton();
         _emotes.LoadButton();
-        _consent.LoadButton(); // Consent system
     }
 }

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -73,16 +73,6 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
-    <ui:MenuButton
-        Name="ConsentButton"
-        Access="Internal"
-        Icon="{xe:Tex '/Textures/Interface/VerbIcons/settings.svg.192dpi.png'}"
-        BoundKey = "{x:Static is:ContentKeyFunctions.OpenConsentWindow}"
-        ToolTip="{Loc 'game-hud-open-consent-window-button-tooltip'}"
-        MinSize="42 64"
-        HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
-        />
     <ui:MenuButton
         Name="AdminButton"
         Access="Internal"