merge master

Author: Stop-Signs

.editorconfig

@@ -127,7 +127,6 @@ csharp_indent_braces = false
 #csharp_indent_case_contents_when_block = true
 #csharp_indent_labels = one_less_than_current
 csharp_indent_switch_labels = true
-xmldoc_indent_text = zeroindent
 
 # Space preferences
 csharp_space_after_cast = false

.github/workflows/close-master-pr.yml

@@ -12,7 +12,7 @@ jobs:
     steps:    
     - uses: superbrothers/close-pull-request@v3
       with:
-        comment: "Thank you for your contribution! It appears you created a PR from your master branch, this is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), and thus this PR has been automatically closed. \n \n We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n \n You can move your current work from the master branch to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). And then you may recreate your PR using the new branch."
+        comment: "Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) \n\n You can move your current work from the master branch to another branch by doing `git branch <branch_name` and resetting the master branch."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
 

.github/workflows/publish.yml

@@ -2,7 +2,6 @@ name: Publish
 
 concurrency:
   group: publish
-  cancel-in-progress: true
 
 on:
   workflow_dispatch:
@@ -49,14 +48,12 @@ jobs:
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (Discord)
-      continue-on-error: true
       run: Tools/actions_changelogs_since_last_run.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
     - name: Publish changelog (RSS)
-      continue-on-error: true
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}

.vscode/tasks.json

@@ -32,50 +32,6 @@
                 "/consoleloggerparameters:'ForceNoAlign;NoSummary'"
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "test",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "test",
-                "--no-build",
-                "--configuration",
-                "DebugOpt",
-                "Content.Tests/Content.Tests.csproj",
-                "--",
-                "NUnit.ConsoleOut=0"
-            ],
-            "group": {
-                "kind": "test"
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "integration-test",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "test",
-                "--no-build",
-                "--configuration",
-                "DebugOpt",
-                "Content.IntegrationTests/Content.IntegrationTests.csproj",
-                "--",
-                "NUnit.ConsoleOut=0",
-                "NUnit.MapWarningTo=Failed.ConsoleOut=0",
-                "NUnit.MapWarningTo=Failed"
-            ],
-            "group": {
-                "kind": "test"
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
         }
     ]
 }

.wiki/_DV/Laws/AlertProcedure.txt

@@ -41,7 +41,7 @@ Elevated alert status. ''There is an ongoing, known, or suspected security threa
 | style="border: 1px solid #000000;" | Open carry of weaponry permitted for authorised entities. Body armour and helmets mandatory for Security personnel, permitted for distribution to authorised personnel.
 |-
 | style="border: 1px solid #000000;" | Discipline
-| style="border: 1px solid #000000;" | Report to supervisor for general orders. Searching individuals suspected of committing a crime is encouraged. Open carry disallowed for non-security personnel.
+| style="border: 1px solid #000000;" | Report to supervisor for general orders. Searches may be performed at the discretion of security personnel and without a warrant. Open carry disallowed for non-security personnel.
 |-
 | style="border: 1px solid #000000;" | Secure Areas
 | style="border: 1px solid #000000;" | Secure areas unlocked unless affected by known threats. Access to [[Standard_Operating_Procedure#High_Security_Areas|HSAs]] locked.
@@ -71,7 +71,7 @@ Emergency alert status. ''There are multiple major emergency situations ongoing,
 | style="border: 1px solid #000000;" | Issuing of lethal weapons heavily recommended. Body armour and helmets mandatory for Security personnel, permitted for distribution to authorised personnel.
 |-
 | style="border: 1px solid #000000;" | Discipline
-| style="border: 1px solid #000000;" | Report to supervisor for general orders. Protection of personnel prioritized over body and department searches. Open carry disallowed for non-security personnel.
+| style="border: 1px solid #000000;" | Report to supervisor for general orders. Searches and departmental raids may be performed at the discretion of security personnel and without a warrant. Open carry disallowed for non-security personnel.
 |-
 | style="border: 1px solid #000000;" | Secure Areas
 | style="border: 1px solid #000000;" | All HSAs should remain locked and under guard. Secure areas unlocked unless affected by known threats.

.wiki/_DV/Laws/StandardOperatingProcedure.txt

@@ -158,7 +158,7 @@ Captain’s Authority carries a responsibility, however; the CO must do everythi
 
 Additionally, the legally appointed Captain of a vessel is afforded two additional rights over that of a CO:
 
-* To, with public announcement to the crew, temporarily modify SOP in times of emergency, at the risk of criminal penalties if misused or abused, and
+* To temporarily modify SOP in times of emergency, at the risk of criminal penalties if misused or abused, and
 * To deputize members of the crew to carry out law enforcement activity. These deputies are bound by Security Regulations and Space Law, and the Captain may suffer criminal penalties for any crime committed by them.
 
 ==Line of Succession==
@@ -202,7 +202,7 @@ While actively enforcing the law, officers are held to the standard of Probable
 When judged, Probable Cause is to be interpreted within the context of the entirety of the station’s circumstances at the time of the incident. Probable Cause negates the need of a warrant for searches, and, once concluded, should be promptly reported to the Prosecutor, Warden, or Head of Security for review.
 
 ==Detainment and Arrest==
-Any sophont may be detained by a law enforcement officer with Probable Cause. In detainment, the officer will inform the Detainee of the crime they are suspected of committing. They may be held on-site or moved to a strategically sound location, restrained at the officer’s discretion, and detained while law enforcement officers determine if they can proceed with an arrest. Such a detention should last no longer than five (5) minutes. A Detainee may not be searched, unless consent is given or they are placed under arrest, and their detention should be concluded within five minutes of its start, by either Arresting them or releasing them.
+Any sophont may be detained by a law enforcement officer with Probable Cause. In detainment, the officer will inform the Detainee of the crime they are suspected of committing. They may be held on-site or moved to a strategically sound location, restrained at the officer’s discretion, and detained while law enforcement officers determine if they can proceed with an arrest. Such a detention should last no longer than five (5) minutes. A Detainee may not be searched, unless consent is given or Alert Procedure allows for warrantless search, and their detention should be concluded within five minutes of its start, by either Arresting them or releasing them.
 
 Any sophont which may have committed a crime, assuming Probable Cause, or has been formally charged with the commission of a crime, may be arrested. In an arrest, the suspect will be restrained by a member of law enforcement, informed of their charges, and taken to the brig for search and processing under Brig Procedure. Any Controlled Items in possession of the Arrestee without licensure or dispensation must be confiscated, along with items used in commission of the crime(s), and will be held indefinitely by law enforcement as described in [[Standard Operating Procedure#Evidence Handling|Evidence Handling]]. Legal counsel may be requested by an Arrestee or Detainee, and must be provided if available.
 
@@ -256,10 +256,7 @@ Prisoners have certain rights that must be upheld by law enforcement and Station
 
 * Adequate medical care and moral, spiritual, or legal counseling if it is requested and available.
 * Access to the Common and Prison radio channels only while serving their sentence. This right may be revoked should it be abused.
-* Standard prisoner clothing must always be available for prisoners.
-* Confiscated clothing should be returned upon request, except in the case of Extended Confinement or if the clothing in question poses a clear risk to prisoner or crew safety.
-* Food and water for organic prisoners must be available and given on request.
-* Power for silicon prisoners such as IPCs and cyborgs, at minimum a cyborg recharging station must be provided.
+* Clothing, food, and water on request.
 * Should the holding cells or Permabrig become uninhabitable, prisoners must be securely and safely relocated to another area for confinement, until the holding cells or Permabrig are returned to a serviceable state.
 * Prisoners should be granted freedom of movement within their holding area unless there is an undue risk to life and limb.
 

BuildChecker/git_helper.py

@@ -5,7 +5,6 @@
 import sys
 import os
 import shutil
-import time
 from pathlib import Path
 from typing import List
 
@@ -109,21 +108,7 @@ def reset_solution():
     with SOLUTION_PATH.open("w") as f:
         f.write(content)
 
-def check_for_zip_download():
-    # Check if .git exists,
-    cur_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-    if not os.path.isdir(os.path.join(cur_dir, ".git")):
-        print("It appears that you downloaded this repository directly from GitHub. (Using the .zip download option) \n"
-              "When downloading straight from GitHub, it leaves out important information that git needs to function. "
-              "Such as information to download the engine or even the ability to even be able to create contributions. \n"
-              "Please read and follow https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html \n"
-              "If you just want a Sandbox Server, you are following the wrong guide! You can download a premade server following the instructions here:"
-              "https://docs.spacestation14.com/en/general-development/setup/server-hosting-tutorial.html \n"
-              "Closing automatically in 30 seconds.")
-        time.sleep(30)
-        exit(1)
 
 if __name__ == '__main__':
-    check_for_zip_download()
     install_hooks()
     update_submodules()

CONTRIBUTING.md

@@ -81,23 +81,7 @@ private EntityUid Slice(...)
 
 If you want to make changes to a map, get in touch with its maintainer to make sure you don't both make changes at the same time.
 
-Conflicts with maps make PRs mutually exclusive so either your work or the maintainer's work will be lost, communicate to avoid this!
-
-Please make a detailed list of **all** changes(even minor changes) with locations when submitting a PR. This helps reviewers hone in on them without having to search an entire map for differences. Ex: [Map Edits](https://github.com/DeltaV-Station/Delta-v/pull/3165)
-
-
-**Submitting a map PR**
-
-Please limit changelogs on map PRs to **significant** map alterations or additions. Minor map edits do not need changelogs.
-Format for map PRs looks like:
-```
-:cl: Yourname
-MAPS: Mapname
-- add: Added fun!
-- remove: Removed fun!
-- tweak: Changed fun!
-- fix: Fixed fun!
-``` 
+Conflicts with maps make PRs mutually exclusive so either your work on the maintainer's work will be lost, communicate to avoid this!
 
 # Before you submit
 

Content.Benchmarks/ComponentQueryBenchmark.cs

@@ -29,7 +29,7 @@ namespace Content.Benchmarks;
 [CategoriesColumn]
 public class ComponentQueryBenchmark
 {
-    public const string Map = "Maps/saltern.yml";
+    public const string Map = "Maps/atlas.yml";
 
     private TestPair _pair = default!;
     private IEntityManager _entMan = default!;

Content.Benchmarks/Program.cs

@@ -1,7 +1,15 @@
 using System;
+using System.Linq;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Running;
+using Content.IntegrationTests;
+using Content.Server.Maps;
+#if DEBUG
 using BenchmarkDotNet.Configs;
+#else
 using Robust.Benchmarks.Configs;
+#endif
+using Robust.Shared.Prototypes;
 
 namespace Content.Benchmarks
 {
@@ -14,15 +22,11 @@ public static void Main(string[] args)
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("\nWARNING: YOU ARE RUNNING A DEBUG BUILD, USE A RELEASE BUILD FOR AN ACCURATE BENCHMARK");
             Console.WriteLine("THE DEBUG BUILD IS ONLY GOOD FOR FIXING A CRASHING BENCHMARK\n");
-            var baseConfig = new DebugInProcessConfig();
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
 #else
-            var baseConfig = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null
-                ? DefaultSQLConfig.Instance
-                : DefaultConfig.Instance;
-#endif
-            var config = ManualConfig.Create(baseConfig);
-            config.BuildTimeout = TimeSpan.FromMinutes(5);
+            var config = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null ? DefaultSQLConfig.Instance : null;
             BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);
+#endif
         }
     }
 }