Fansana · DakoDemon · Aug 20, 2024 · Aug 20, 2024 · Aug 22, 2024
@@ -7,6 +7,7 @@
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Shared.Utility;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.GameTicking.Managers
 {
@@ -15,6 +16,7 @@ public sealed class ClientGameTicker : SharedGameTicker
     {
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
 
         [ViewVariables] private bool _initialized;
         private Dictionary<NetEntity, Dictionary<string, uint?>>  _jobsAvailable = new();
@@ -132,12 +134,7 @@ private void RoundEnd(RoundEndMessageEvent message)
             // Force an update in the event of this song being the same as the last.
             RestartSound = message.RestartSound;
 
-            // Don't open duplicate windows (mainly for replays).
-            if (_window?.RoundId == message.RoundId)
-                return;
-
-            //This is not ideal at all, but I don't see an immediately better fit anywhere else.
-            _window = new RoundEndSummaryWindow(message.GamemodeTitle, message.RoundEndText, message.RoundDuration, message.RoundId, message.AllPlayersEndInfo, _entityManager);
+            _userInterfaceManager.GetUIController<RoundEndSummaryUIController>().OpenRoundEndSummaryWindow(message);
         }
     }
 }
@@ -38,6 +38,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             common.AddFunction(ContentKeyFunctions.ZoomIn);
             common.AddFunction(ContentKeyFunctions.ResetZoom);
             common.AddFunction(ContentKeyFunctions.InspectEntity);
+            common.AddFunction(ContentKeyFunctions.ToggleRoundEndSummaryWindow);
 
             // Not in engine, because engine cannot check for sanbox/admin status before starting placement.
             common.AddFunction(ContentKeyFunctions.EditorCopyObject);

@@ -218,6 +218,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OpenLanguageMenu);
             AddButton(ContentKeyFunctions.OpenAHelp);
             AddButton(ContentKeyFunctions.OpenActionsMenu);
+            AddButton(ContentKeyFunctions.ToggleRoundEndSummaryWindow);
             AddButton(ContentKeyFunctions.OpenEntitySpawnWindow);
             AddButton(ContentKeyFunctions.OpenSandboxWindow);
             AddButton(ContentKeyFunctions.OpenTileSpawnWindow);

@@ -0,0 +1,51 @@
+using Content.Client.GameTicking.Managers;
+using Content.Shared.GameTicking;
+using Content.Shared.Input;
+using JetBrains.Annotations;
+using Robust.Client.Input;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+
+namespace Content.Client.RoundEnd;
+
+[UsedImplicitly]
+public sealed class RoundEndSummaryUIController : UIController,
+    IOnSystemLoaded<ClientGameTicker>
+{
+    [Dependency] private readonly IInputManager _input = default!;
+
+    private RoundEndSummaryWindow? _window;
+
+    private void ToggleScoreboardWindow(ICommonSession? session = null)
+    {
+        if (_window == null)
+            return;
+
+        if (_window.IsOpen)
+        {
+            _window.Close();
+        }
+        else
+        {
+            _window.OpenCenteredRight();
+            _window.MoveToFront();
+        }
+    }
+
+    public void OpenRoundEndSummaryWindow(RoundEndMessageEvent message)
+    {
+        // Don't open duplicate windows (mainly for replays).
+        if (_window?.RoundId == message.RoundId)
+            return;
+
+        _window = new RoundEndSummaryWindow(message.GamemodeTitle, message.RoundEndText,
+            message.RoundDuration, message.RoundId, message.AllPlayersEndInfo, EntityManager);
+    }
+
+    public void OnSystemLoaded(ClientGameTicker system)
+    {
+        _input.SetInputCommand(ContentKeyFunctions.ToggleRoundEndSummaryWindow,
+            InputCmdHandler.FromDelegate(ToggleScoreboardWindow));
+    }
+}
@@ -43,6 +43,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction MovePulledObject = "MovePulledObject";
         public static readonly BoundKeyFunction ReleasePulledObject = "ReleasePulledObject";
         public static readonly BoundKeyFunction MouseMiddle = "MouseMiddle";
+        public static readonly BoundKeyFunction ToggleRoundEndSummaryWindow = "ToggleRoundEndSummaryWindow";
         public static readonly BoundKeyFunction OpenConsentWindow = "OpenConsentWindow";
         public static readonly BoundKeyFunction OpenEntitySpawnWindow = "OpenEntitySpawnWindow";
         public static readonly BoundKeyFunction OpenSandboxWindow = "OpenSandboxWindow";

@@ -480,3 +480,25 @@ Entries:
       message: Blood-Red Collar to SyndieDrobe and Loadout
   id: 67
   time: '2024-08-13T20:40:40.0000000+00:00'
+- author: Xavier
+  changes:
+    - type: Add
+      message: F9 now opens the RoundEnd Screen! May have to press twice.
+  id: 68
+  time: '2024-08-14T23:48:02.0000000+00:00'
+- author: ShatteredSwords
+  changes:
+    - type: Add
+      message: >-
+        The lab coat is now available for everyone, because you can be a
+        scientist without working in Epistemics.
+    - type: Tweak
+      message: Loadout points have been increased from 14 to 20.
+  id: 69
+  time: '2024-08-14T23:53:38.0000000+00:00'
+- author: neuPanda
+  changes:
+    - type: Add
+      message: Added way to make Double Cream Blaster with all natural creams
+  id: 70
+  time: '2024-08-15T00:10:40.0000000+00:00'
@@ -173,6 +173,7 @@ ui-options-function-open-crafting-menu = Open crafting menu
 ui-options-function-open-inventory-menu = Open inventory
 ui-options-function-open-a-help = Open admin help
 ui-options-function-open-abilities-menu = Open action menu
+ui-options-function-toggle-round-end-summary-window = Toggle round end summary window
 ui-options-function-open-entity-spawn-window = Open entity spawn menu
 ui-options-function-open-sandbox-window = Open sandbox menu
 ui-options-function-open-tile-spawn-window = Open tile spawn menu

@@ -16,4 +16,8 @@
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
+    # Floofstation - Departmental Socks ect
+    ClothingUniformBartenderThong: 3
+    ClothingUnderSocksBartender: 3
+    ClothingHandsBartenderWarmers: 3
 
@@ -13,3 +13,7 @@
     ClothingShoesBootsWinterChef: 2 #Delta V: Add departmental winter boots
     ClothingShoesChef: 2
     ClothingBeltChef: 2
+    # Floofstation - Departmental Socks ect
+    ClothingHandsChefWarmers: 2
+    ClothingUnderSocksChef: 2
+    ClothingUniformChefThong: 2
@@ -20,4 +20,8 @@
     ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry
     ClothingEyesGlassesChemist: 2 # Safety glasses
     ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves
-    # End of modified code
+    # End of modified code
+    # Floofstation - Departmental Socks ect
+    ClothingHandsChemistsWarmers: 1
+    ClothingUnderSocksChemists: 1
+    ClothingUniformChemistsThong: 1
@@ -11,3 +11,5 @@
     ClothingHeadsetRobotics: 2
     ClothingOuterWinterRobo: 2
     ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots
+    ClothingOuterRoboOveralls: 2 #Floofstation - Add overalls
+    ClothingOuterPlainOveralls: 2
@@ -24,9 +24,9 @@
     ClothingNeckScarfStripedRed: 3
     ClothingEyesBlindfold: 1
     ClothingNeckCollarSec: 1 # Floofstation - Collar addition
-    ClothingHandsSecurityWarmers: 1 # Floofstation
-    ClothingUnderSocksSecurity: 1 # Floofstation
-    ClothingUniformSecurityThong: 1 # Floofstation
+    ClothingHandsSecurityWarmers: 2 # Floofstation
+    ClothingUnderSocksSecurity: 2 # Floofstation
+    ClothingUniformSecurityThong: 2 # Floofstation
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingShoesBootsCowboyBlack: 1

@@ -88,6 +88,15 @@
     ClothingShoesBootsCowboyBlack: 1
     ClothingShoesBootsCowboyWhite: 1
     ClothingMaskNeckGaiterRed: 2
+    # Floofstation - Departmental Socks ect
+    ClothingUniformMusicianThong: 2
+    ClothingUnderSocksMusician: 2
+    ClothingHandsMusicianWarmers: 2
+    ClothingHandsStripeWhiteWarmers: 1
+    ClothingUnderSocksStripedWhite: 1
+    ClothingUniformStripedThongWhite: 1
+    ClothingUniformMusicKingBlack: 2
+    ClothingUniformMusicKing: 2
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1

@@ -27,6 +27,12 @@
        ClothingUniformColorRainbow: 2
        ClothingUnderSocksCoder: 1
        ClothingUnderSocksBee: 1
+       ClothingHandsBeeWarmers: 1
+       ClothingHandsCoderWarmers: 1
+       ClothingUniformThongCoder: 1
+       ClothingUniformThongBee: 1
   emaggedInventory:
       # 3 for more friends!
-      ClothingUnderSocksCoderValid: 3 # Floofstation
+      ClothingUnderSocksCoderValid: 3 # Floofstation
+      ClothingHandsCoderValidWarmers: 3
+      ClothingUniformThongCoderValid: 3
@@ -1157,6 +1157,15 @@
       - ClothingHandsStripeWhiteWarmers
       - ClothingUnderSocksStripedWhite
       - ClothingUniformStripedThongWhite
+      - ClothingHandsCoderWarmers
+      - ClothingUnderSocksCoder
+      - ClothingUniformThongCoder
+      - ClothingHandsCoderValidWarmers
+      - ClothingUnderSocksCoderValid
+      - ClothingUniformThongCoderValid
+      - ClothingHandsBeeWarmers
+      - ClothingUnderSocksBee
+      - ClothingUniformThongBee
       # Floofstation - Department Socks, Armwarmers ect
       - ClothingHandsCaptainWarmers
       - ClothingUnderSocksCaptain

@@ -69,7 +69,7 @@
   - type: Clothing
     sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi
   - type: Fiber
-    fiberMaterial: fibers-cotton
+    fiberMaterial: fibers-synthetic
     fiberColor: fibers-white
   - type: FingerprintMask
 
@@ -84,7 +84,7 @@
   - type: Clothing
     sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi
   - type: Fiber
-    fiberMaterial: fibers-cotton
+    fiberMaterial: fibers-synthetic
     fiberColor: fibers-purple
   - type: FingerprintMask
 
@@ -99,8 +99,8 @@
   - type: Clothing
     sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
   - type: Fiber
-    fiberMaterial: fibers-cotton
-    fiberColor: fibers-colorful
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-purple
   - type: FingerprintMask
 
 - type: entity

@@ -53,3 +53,59 @@
     sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodMarsHoodieHood
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterRoboOveralls
+  name: robotocist overalls
+  description: A simple pair of overalls, designed to go over a jumpsuit.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/Misc/robooveralls.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/Misc/robooveralls.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterPlainOveralls
+  name: plain overalls
+  description: A simple pair of overalls, designed to go over a jumpsuit.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi
+
+#Cybercoats
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCyberJacketYellow
+  name: yellow cyberjacket
+  description: a brightly coloured jacket, with a short crop.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCyberJacketPurple
+  name: purple cyberjacket
+  description: a brightly coloured jacket, with a short crop.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCyberJacketWhite
+  name: white cyberjacket
+  description: a mono coloured jacket, with a short crop.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi