Merge remote-tracking branch 'origin/master'

.github/workflows/changelog.yml

@@ -5,10 +5,9 @@ on:
     types: [closed]
 
 env:
-  BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
-  CHANGELOG_DIR: Resources/Changelog/ChangelogLPP.yml
+  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+  CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
   PR_NUMBER: ${{ github.event.number }}
-  CHANGELOG_DISCORD_WEBHOOK: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
 jobs:
   changelog:
@@ -21,7 +20,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         token: ${{ secrets.BOT_TOKEN }}
-        ref: master
+        ref: ${{ vars.CHANGELOG_BRANCH }}
 
     - name: Setup Git
       run: |

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

@@ -11,7 +11,6 @@ jobs:
     steps:
     - uses: superbrothers/close-pull-request@v3
       with:
-        github_token: ${{ secrets.BOT_TOKEN }}
         comment: "Благодарим вас за вклад в наш репозиторий. К сожалению, похоже, что вы отправили ПР из master ветки. Мы рекомендуем вам следовать [документации](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n Вы можете перенести свою текущую работу из основной ветки в другую ветку с помощью [создания новой](https://git-scm.com/docs/git-branch) и [очистки](https://git-scm.com/docs/git-reset) master ветки."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above

.github/workflows/conflict-labeler.yml

@@ -15,5 +15,5 @@ jobs:
         uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
         with:
           dirtyLabel: "Статус: Конфликт"
-          repoToken: "${{ secrets.BOT_TOKEN }}"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР."

.github/workflows/publish-changelog.yml → .github/workflows/discord-changelog.yml

@@ -1,4 +1,4 @@
-name: Publish Changelog
+name: Discord Changelog
 
 on:
   workflow_dispatch:
@@ -13,12 +13,12 @@ jobs:
     - name: checkout
       uses: actions/checkout@v3
       with:
-        token: ${{secrets.BOT_TOKEN}}
         ref: master
 
     - name: Publish changelog
       run: Tools/actions_changelogs_since_last_run.py
       env:
-        BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
-        CHANGELOG_DISCORD_WEBHOOK: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
+        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
+        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
     continue-on-error: true

.github/workflows/labeler-needsreview.yml

@@ -11,8 +11,6 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
         labels: "Статус: Требуется одобрение"
-        repo-token: "${{ secrets.BOT_TOKEN }}"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
         labels: "Статус: Ожидание изменений"
-        repo-token: "${{ secrets.BOT_TOKEN }}"

.github/workflows/labeler-pr.yml

@@ -10,4 +10,4 @@ jobs:
     steps:
     - uses: actions/labeler@v3
       with:
-        repo-token: "${{ secrets.BOT_TOKEN }}"
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/rsi-diff.yml

@@ -44,7 +44,6 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           issue-number: ${{ github.event.number }}
-          token: ${{ secrets.BOT_TOKEN }}
           body: |
             ${{ steps.diff.outputs.summary-details }}
 
@@ -53,7 +52,6 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
-          token: ${{ secrets.BOT_TOKEN }}
           edit-mode: replace
           body: |
             ${{ steps.diff.outputs.summary-details }}
@@ -63,7 +61,6 @@ jobs:
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
-          token: ${{ secrets.BOT_TOKEN }}
           edit-mode: append
           body: |
             Edit: diff updated after ${{ github.event.pull_request.head.sha }}

.github/workflows/test-secrets1.yml

@@ -3,14 +3,11 @@ name: YAML Linter Secrets
 on:
   push:
     branches: [ master, staging, trying ]
-  merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   build:
     name: YAML Linter Secrets
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/[email protected]

.github/workflows/test-secrets2.yml

@@ -13,23 +13,11 @@ on:
     # why not just do both
     - 'RobustToolbox'
     - 'RobustToolbox/**'
-  merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master ]
-    paths:
-    - '**.cs'
-    - '**.csproj'
-    - '**.sln'
-    - '**.git**'
-    - '**.yml'
-    - 'RobustToolbox'
-    - 'RobustToolbox/**'
 
 jobs:
   build:
     name: Test Packaging Secrets
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise'
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/test-secrets3.yml

@@ -1,16 +1,14 @@
 name: Build & Test Debug Secrets
 
+
 on:
   push:
     branches: [ master, staging, trying ]
   merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master ]
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise'
     strategy:
       matrix:
         os: [ubuntu-latest]

Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs

@@ -0,0 +1,45 @@
+using Content.Server.Body.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.CCVar;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Contests;
+using Content.Shared.HeightAdjust;
+using Robust.Shared.Configuration;
+
+namespace Content.Server.HeightAdjust;
+
+public sealed class BloodstreamAdjustSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<BloodstreamAffectedByMassComponent, MapInitEvent>((uid, comp, _) => TryAdjustBloodstream((uid, comp)));
+        SubscribeLocalEvent<BloodstreamAffectedByMassComponent, HeightAdjustedEvent>((uid, comp, _) => TryAdjustBloodstream((uid, comp)));
+    }
+
+    /// <summary>
+    ///     Adjusts the bloodstream of the specified entity based on the settings provided by the component.
+    /// </summary>
+    public bool TryAdjustBloodstream(Entity<BloodstreamAffectedByMassComponent> ent)
+    {
+        if (!TryComp<BloodstreamComponent>(ent, out var bloodstream)
+            || !_solutionContainer.TryGetSolution(ent.Owner, bloodstream.BloodSolutionName, out var bloodSolutionEnt)
+            || !_config.GetCVar(CCVars.HeightAdjustModifiesBloodstream))
+            return false;
+
+        var bloodSolution = bloodSolutionEnt.Value.Comp.Solution;
+
+        var factor = Math.Pow(_contests.MassContest(ent, bypassClamp: true, rangeFactor: 4f), ent.Comp.Power);
+        factor = Math.Clamp(factor, ent.Comp.Min, ent.Comp.Max);
+
+        var newVolume = bloodstream.BloodMaxVolume * factor;
+        var newBloodLevel = bloodSolution.FillFraction * newVolume;
+        bloodSolution.MaxVolume = newVolume;
+        bloodSolution.SetContents([new ReagentQuantity(bloodstream.BloodReagent, newBloodLevel, null)], false);
+
+        return true;
+    }
+}

Content.Server/HeightAdjust/BloodstreamAffectedByMassComponent.cs

@@ -0,0 +1,26 @@
+using Content.Server.Body.Components;
+
+namespace Content.Server.HeightAdjust;
+
+/// <summary>
+///     When applied to a humanoid or any mob, adjusts their blood level based on the mass contest between them
+///     and an average humanoid.
+///     <br/>
+///     The formula for the resulting bloodstream volume is <code>V = BloodMaxVolume * MassContest^Power</code>
+///     clamped between the specified Min and Max values.
+/// </summary>
+[RegisterComponent]
+public sealed partial class BloodstreamAffectedByMassComponent : Component
+{
+    /// <summary>
+    ///     Minimum and maximum resulting volume factors. A minimum value of 0.5 means that the resulting volume will be at least 50% of the original.
+    /// </summary>
+    [DataField]
+    public float Min = 1 / 3f, Max = 3f;
+
+    /// <summary>
+    ///     The power to which the outcome of the mass contest will be risen.
+    /// </summary>
+    [DataField]
+    public float Power = 1f;
+}

Content.Server/InteractionVerbs/Actions/MoodAction.cs

@@ -0,0 +1,42 @@
+using Content.Shared.InteractionVerbs;
+using Content.Shared.Mood;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.InteractionVerbs.Actions;
+
+/// <summary>
+///     An action that adds a moodlet to the target, or removes one.
+/// </summary>
+[Serializable]
+public sealed partial class MoodAction : InteractionAction
+{
+    [DataField(required: true)]
+    public ProtoId<MoodEffectPrototype> Effect;
+
+    /// <summary>
+    ///     Parameters for the <see cref="MoodEffectEvent"/>. Only used if <see cref="Remove"/> is false.
+    /// </summary>
+    [DataField]
+    public float Modifier = 1f, Offset = 0f;
+
+    /// <summary>
+    ///     If true, the moodlet will be removed. Otherwise, it will be added.
+    /// </summary>
+    [DataField]
+    public bool Remove = false;
+
+    public override bool CanPerform(InteractionArgs args, InteractionVerbPrototype proto, bool isBefore, VerbDependencies deps)
+    {
+        return true;
+    }
+
+    public override bool Perform(InteractionArgs args, InteractionVerbPrototype proto, VerbDependencies deps)
+    {
+        if (Remove)
+            deps.EntMan.EventBus.RaiseLocalEvent(args.Target, new MoodRemoveEffectEvent(Effect));
+        else
+            deps.EntMan.EventBus.RaiseLocalEvent(args.Target, new MoodEffectEvent(Effect, Modifier, Offset));
+
+        return true; // Mood system is shitcode so we can't even know if the effect was added or anything
+    }
+}