Merge branch 'space-sunrise:master' into medibot-resprite

.editorconfig

@@ -1,4 +1,5 @@
 root = true
+
 [*]
 
 charset = utf-8
@@ -278,7 +279,7 @@ dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case
 dotnet_naming_style.t_upper_camel_case_style.required_prefix = T
 dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
 
-dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.constants_symbols.applicable_kinds = field
 dotnet_naming_symbols.constants_symbols.required_modifiers = const
 
@@ -317,20 +318,20 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
 
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
-dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
 
 dotnet_naming_symbols.property_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.property_symbols.applicable_kinds = property
 
-dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field
 
-dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
-dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
+dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly
 
 dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = *
-dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
+dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate
 
 dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
@@ -342,6 +343,7 @@ resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_keep_existing_attribute_arrangement = true
 resharper_wrap_chained_binary_patterns = chop_if_long
 resharper_wrap_chained_method_calls = chop_if_long
+resharper_csharp_trailing_comma_in_multiline_lists = true
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2

.github/CODEOWNERS

@@ -55,3 +55,7 @@
 #Jezi
 /Content.*/Medical @Jezithyr
 /Content.*/Body @Jezithyr
+
+
+# Ping for all PRs
+* @VigersRay

.github/workflows/automatic_changelog.yml

@@ -0,0 +1,17 @@
+name: Update sunrise changelog
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    types: [closed]
+    branches: [master]
+
+jobs:
+  update_changelog:
+    if: github.event.pull_request.merged == true && github.event.commits[0].author.name != 'GitHubActions'
+    uses: space-sunrise/space-station-14/.github/workflows/update_changelog.yml@master
+    with:
+      pr_body: ${{ github.event.pull_request.body }}
+    secrets:
+      envPAT: ${{ secrets.GH_TOKEN }}

.github/workflows/build-map-renderer.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false
     strategy:
       matrix:
         os: [ubuntu-latest]

.github/workflows/build-test-debug.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false
     strategy:
       matrix:
         os: [ubuntu-latest]

.github/workflows/conflict-labeler.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   Label:
-    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' )
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'GitHubActions' )
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts

.github/workflows/labeler-pr.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   labeler:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'GitHubActions'
     permissions:
       contents: read
       pull-requests: write

.github/workflows/test-packaging.yml

@@ -29,7 +29,7 @@ on:
 jobs:
   build:
     name: Test Packaging
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/update_changelog.yml

@@ -1,23 +1,25 @@
 name: Update sunrise changelog
 
 on:
-  push:
-    branches: [master]
-  pull_request:
-    types: [closed]
-    branches: [master]
+  workflow_call:
+    inputs:
+      pr_body:
+        required: true
+        type: string
+    secrets:
+      envPAT:
+        required: true
 
 jobs:
   update_changelog:
-    if: github.event.pull_request.merged == true && github.event.commits[0].author.name != 'GitHubActions'
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v3
       with:
         fetch-depth: 0
-        token: ${{ secrets.GH_TOKEN }}
+        token: ${{ secrets.envPAT }}
 
     - name: Configure git
       run: |
@@ -33,7 +35,7 @@ jobs:
       run: pip install pyyaml requests
 
     - name: Save PR Body to File
-      run: echo "${{ github.event.pull_request.body }}" > pr_body.txt
+      run: echo "${{ inputs.pr_body }}" > pr_body.txt
 
     - name: Extract Changelog from PR
       env:

.github/workflows/validate-rgas.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML RGA schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]

.github/workflows/validate_mapfiles.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML map schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]

.github/workflows/yaml-linter.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: YAML Linter
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
+    if: github.actor != 'GitHubActions' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]

Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs

@@ -135,6 +135,10 @@ public float InternalPressureBound
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("depressurizePressure")]
         public float DepressurizePressure = 0;
+
+        // When true, ignore under-pressure lockout. Used to re-fill rooms in air alarm "Fill" mode.
+        [DataField]
+        public bool PressureLockoutOverride = false;
         #endregion
 
         public GasVentPumpData ToAirAlarmData()
@@ -146,7 +150,8 @@ public GasVentPumpData ToAirAlarmData()
                 PumpDirection = PumpDirection,
                 PressureChecks = PressureChecks,
                 ExternalPressureBound = ExternalPressureBound,
-                InternalPressureBound = InternalPressureBound
+                InternalPressureBound = InternalPressureBound,
+                PressureLockoutOverride = PressureLockoutOverride
             };
         }
 
@@ -158,6 +163,7 @@ public void FromAirAlarmData(GasVentPumpData data)
             PressureChecks = data.PressureChecks;
             ExternalPressureBound = data.ExternalPressureBound;
             InternalPressureBound = data.InternalPressureBound;
+            PressureLockoutOverride = data.PressureLockoutOverride;
         }
     }
 }

Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs

@@ -108,7 +108,8 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref
                 // (ignoring temperature differences because I am lazy)
                 var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R);
 
-                if (vent.UnderPressureLockout)
+                // Only run if the device is under lockout and not being overriden
+                if (vent.UnderPressureLockout & !vent.PressureLockoutOverride)
                 {
                     // Leak only a small amount of gas as a proportion of supply pipe pressure.
                     var pipeDelta = pipe.Air.Pressure - environment.Pressure;
@@ -280,7 +281,7 @@ private void OnExamine(EntityUid uid, GasVentPumpComponent component, ExaminedEv
                 return;
             if (args.IsInDetailsRange)
             {
-                if (pumpComponent.UnderPressureLockout)
+                if (pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride)
                 {
                     args.PushMarkup(Loc.GetString("gas-vent-pump-uvlo"));
                 }

Content.Server/Bed/BedSystem.cs

@@ -1,6 +1,5 @@
 using Content.Server.Actions;
 using Content.Server.Bed.Components;
-using Content.Server.Bed.Sleep;
 using Content.Server.Body.Systems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;