Merge pull request #336 from Fansana/master

Floofstation Release V1

.github/workflows/changelog.yml

@@ -3,6 +3,8 @@ concurrency: commit_action
 on:
   pull_request_target:
     types: [closed]
+    branches:
+      - stable
 
 env:
   GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}

.github/workflows/discord-changelog.yml

@@ -13,7 +13,7 @@ jobs:
     - name: checkout
       uses: actions/checkout@v3
       with:
-        ref: master
+        ref: stable
 
     - name: Publish changelog
       run: Tools/actions_changelogs_since_last_run.py

.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
 
     - uses: actions/[email protected]
       with:
-        ref: master
+        ref: stable
         submodules: 'recursive'
     - name: Setup .NET Core
       uses: actions/[email protected]

.github/workflows/stable-pr.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   run:
     runs-on: ubuntu-latest
-    if: ${{github.base_ref == 'stable' && github.actor != 'Fansana'}}
+    if: ${{ github.base_ref == 'stable' && github.actor != 'Fansana' && github.actor != 'Memeji' && github.actor != 'FoxxoTrystan' }}
 
     steps:
     - uses: superbrothers/close-pull-request@v3

Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs

@@ -34,6 +34,8 @@ private void OnPowerUsed(DarkSwapActionEvent args)
 
                 if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost / 2, args.CheckInsulation))
                 {
+                    SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates);
+                    SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates);
                     RemComp(args.Performer, ethereal);
                     args.Handled = true;
                 }

Content.Server/Communications/CommunicationsConsoleSystem.cs

@@ -200,13 +200,11 @@ private bool CanUse(EntityUid user, EntityUid console)
         private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
         {
             // Defer to what the round end system thinks we should be able to do.
-            if (_emergency.EmergencyShuttleArrived || !_roundEndSystem.CanCallOrRecall())
+            if (_emergency.EmergencyShuttleArrived
+                || !_roundEndSystem.CanCallOrRecall()
+                || !comp.CanShuttle)
                 return false;
 
-            // Calling shuttle checks
-            if (_roundEndSystem.ExpectedCountdownEnd is null)
-                return comp.CanShuttle;
-
             // Recalling shuttle checks
             var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);
 

Content.Server/Shadowkin/EtherealSystem.cs

@@ -79,9 +79,6 @@ public override void OnShutdown(EntityUid uid, EtherealComponent component, Comp
         RemComp<RespiratorImmuneComponent>(uid);
         RemComp<MovementIgnoreGravityComponent>(uid);
 
-        SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates);
-        SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates);
-
         foreach (var light in component.DarkenedLights.ToArray())
         {
             if (!TryComp<PointLightComponent>(light, out var pointLight)
@@ -181,7 +178,7 @@ public override void Update(float frameTime)
 
                 if (etherealLight.AttachedEntity == uid
                     && _random.Prob(0.03f))
-                        etherealLight.AttachedEntity = EntityUid.Invalid;
+                    etherealLight.AttachedEntity = EntityUid.Invalid;
 
                 if (!etherealLight.OldRadiusEdited)
                 {
@@ -213,4 +210,4 @@ public override void Update(float frameTime)
             }
         }
     }
-}
+}

Content.Server/StationEvents/Components/PirateRadioSpawnRuleComponent.cs

@@ -8,7 +8,7 @@ public sealed partial class PirateRadioSpawnRuleComponent : Component
     [DataField]
     public List<string> PirateRadioShuttlePath { get; private set; } = new()
     {
-        "Maps/Shuttles/pirateradio.yml",
+        "Maps/Floof/pirateradio.yml", // Floofstation
     };
 
     [DataField]

Resources/Locale/en-US/Floof/hypno.ftl

@@ -12,7 +12,7 @@ hypno-free = I feel able to make my own toughts again.
 hypno-release = Release Subject
 
 hypno-start = You stare into {POSS-ADJ($target)} eyes...
-hypno-phase-1 = {CAPITALIZE($entity)} eyes glows in such pretty colors... it's hard to look away...
+hypno-phase-1 = {CAPITALIZE($target)} eyes glows in such pretty colors... it's hard to look away...
 hypno-phase-2 = The more you stare at {POSS-ADJ($target)} eyes... the more its i's hard to think... to have a thought...
 hypno-phase-3 = What was I doing... again? It's so hard to think... maybe I don't need to anymore, just stare... its just... so pretty...
 hypno-success = {CAPITALIZE(SUBJECT($target))} stares into your eyes, lost in them, lost in you.

Resources/Locale/en-US/Floof/store/uplink-catalog.ftl

@@ -1,3 +1,7 @@
 # Pointless
 uplink-coder-socks-valid-name = Blood-red Coder Socks
-uplink-coder-socks-valid-desc = These socks add onto your robustness by making you look breedable. Make trojans, not war.
+uplink-coder-socks-valid-desc = These socks add onto your robustness by making you look breedable. Make trojans, not war.
+
+# Floof station
+uplink-Cryptobiolininjector-name = Cryptobiolin injector
+uplink-Cryptobiolininjector-desc = Made by SESWC. This item is prefilled with 20u of Cryptobiolin to help you get rid of those pesky psionic weirdo's.