Merge remote-tracking branch 'EE/master' into Upsteam/17/15/2024

Author: FoxxoTrystan

.vscode/settings.json

@@ -1,4 +1,10 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "json.schemas": [
+        {
+            "fileMatch": [ "**/meta.json" ],
+            "url": "https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/.github/rsi-schema.json"
+        }
+    ]
 }

Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs

@@ -26,7 +26,7 @@ public Dictionary<Vector2i, TileAtmosphere> Read(ISerializationManager serializa
     {
         node.TryGetValue(new ValueDataNode("version"), out var versionNode);
         var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1;
-        Dictionary<Vector2i, TileAtmosphere> tiles;
+        Dictionary<Vector2i, TileAtmosphere> tiles = new();
 
         // Backwards compatability
         if (version == 1)
@@ -36,8 +36,6 @@ public Dictionary<Vector2i, TileAtmosphere> Read(ISerializationManager serializa
             var mixies = serializationManager.Read<Dictionary<Vector2i, int>?>(tile2, hookCtx, context);
             var unique = serializationManager.Read<List<GasMixture>?>(node["uniqueMixes"], hookCtx, context);
 
-            tiles = new Dictionary<Vector2i, TileAtmosphere>();
-
             if (unique != null && mixies != null)
             {
                 foreach (var (indices, mix) in mixies)
@@ -58,15 +56,14 @@ public Dictionary<Vector2i, TileAtmosphere> Read(ISerializationManager serializa
         else
         {
             var dataNode = (MappingDataNode) node["data"];
-            var tileNode = (MappingDataNode) dataNode["tiles"];
             var chunkSize = serializationManager.Read<int>(dataNode["chunkSize"], hookCtx, context);
 
-            var unique = serializationManager.Read<List<GasMixture>?>(dataNode["uniqueMixes"], hookCtx, context);
-
-            tiles = new Dictionary<Vector2i, TileAtmosphere>();
+            dataNode.TryGetValue(new ValueDataNode("uniqueMixes"), out var mixNode);
+            var unique = mixNode == null ? null : serializationManager.Read<List<GasMixture>?>(mixNode, hookCtx, context);
 
             if (unique != null)
             {
+                var tileNode = (MappingDataNode) dataNode["tiles"];
                 foreach (var (chunkNode, valueNode) in tileNode)
                 {
                     var chunkOrigin = serializationManager.Read<Vector2i>(chunkNode, hookCtx, context);

Content.Shared/Alert/AlertType.cs

@@ -37,6 +37,7 @@ public enum AlertType : byte
         Internals,
         Toxins,
         Muted,
+        Walking,
         VowOfSilence,
         VowBroken,
         Essence,

Content.Shared/CCVar/CCVars.cs

@@ -1671,6 +1671,23 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<int> ViewportWidth =
             CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+        /*
+         * FOV
+         */
+
+        /// <summary>
+        ///     The number by which the current FOV size is divided for each level.
+        /// </summary>
+        public static readonly CVarDef<float> ZoomLevelStep =
+            CVarDef.Create("fov.zoom_step", 1.2f, CVar.SERVER | CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many times the player can zoom in until they reach the minimum zoom.
+        ///     This does not affect the maximum zoom.
+        /// </summary>
+        public static readonly CVarDef<int> ZoomLevels =
+            CVarDef.Create("fov.zoom_levels", 7, CVar.SERVER | CVar.REPLICATED);
+
         /*
          * UI
          */

Content.Shared/Movement/Components/CanWalkComponent.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Indicates if the entity can toggle walking or not.
+/// </summary>
+[NetworkedComponent, RegisterComponent]
+public sealed partial class CanWalkComponent : Component
+{
+}

Content.Shared/Movement/Components/InputMoverComponent.cs

@@ -1,9 +1,11 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Movement.Components
 {
@@ -74,6 +76,9 @@ public sealed partial class InputMoverComponent : Component
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool CanMove = true;
+
+        [DataField]
+        public ProtoId<AlertPrototype> WalkingAlert = "Walking";
     }
 
     [Serializable, NetSerializable]

Content.Shared/Movement/Systems/SharedContentEyeSystem.cs

@@ -1,9 +1,11 @@
 using System.Numerics;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Managers;
+using Content.Shared.CCVar;
 using Content.Shared.Ghost;
 using Content.Shared.Input;
 using Content.Shared.Movement.Components;
+using Robust.Shared.Configuration;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization;
@@ -16,10 +18,13 @@ namespace Content.Shared.Movement.Systems;
 public abstract class SharedContentEyeSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminManager _admin = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
-    public const float ZoomMod = 1.5f;
-    public static readonly Vector2 DefaultZoom = Vector2.One;
-    public static readonly Vector2 MinZoom = DefaultZoom * (float)Math.Pow(ZoomMod, -3);
+    // Will be overridden according to config.
+    public readonly Vector2 DefaultZoom = Vector2.One;
+    public float ZoomMod { get; private set; } = 1f;
+    public int ZoomLevels { get; private set; } = 1;
+    public Vector2 MinZoom { get; private set; } = Vector2.One;
 
     [Dependency] private readonly SharedEyeSystem _eye = default!;
 
@@ -38,6 +43,17 @@ public override void Initialize()
 
         Log.Level = LogLevel.Info;
         UpdatesOutsidePrediction = true;
+
+        Subs.CVar(_config, CCVars.ZoomLevelStep, value =>
+        {
+            ZoomMod = value;
+            RecalculateZoomLevels();
+        }, true);
+        Subs.CVar(_config, CCVars.ZoomLevels, value =>
+        {
+            ZoomLevels = value;
+            RecalculateZoomLevels();
+        }, true);
     }
 
     public override void Shutdown()
@@ -46,6 +62,11 @@ public override void Shutdown()
         CommandBinds.Unregister<SharedContentEyeSystem>();
     }
 
+    private void RecalculateZoomLevels()
+    {
+        MinZoom = DefaultZoom * (float) Math.Pow(ZoomMod, -ZoomLevels);
+    }
+
     private void ResetZoom(ICommonSession? session)
     {
         if (TryComp(session?.AttachedEntity, out ContentEyeComponent? eye))

Content.Shared/Movement/Systems/SharedMoverController.Input.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.CCVar;
 using Content.Shared.Follower.Components;
 using Content.Shared.Input;
@@ -333,6 +334,7 @@ private void OnInputInit(EntityUid uid, InputMoverComponent component, Component
 
             component.RelativeEntity = xform.GridUid ?? xform.MapUid;
             component.TargetRelativeRotation = Angle.Zero;
+            WalkingAlert(uid, !component.Sprinting);
         }
 
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
@@ -344,6 +346,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
                 // if we swap to relay then stop our existing input if we ever change back.
                 if (moverComp != null)
                 {
+                    WalkingAlert(uid, walking);
                     SetMoveInput(moverComp, MoveButtons.None);
                 }
 
@@ -460,10 +463,11 @@ private void ResetSubtick(InputMoverComponent component)
             component.LastInputSubTick = 0;
         }
 
+
         public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking)
         {
             // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
-
+            WalkingAlert(entity, walking);
             SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk);
         }
 

Content.Shared/Movement/Systems/SharedMoverController.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.CCVar;
 using Content.Shared.Friction;
@@ -25,6 +26,7 @@
 using Robust.Shared.Utility;
 using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
 
+
 namespace Content.Shared.Movement.Systems
 {
     /// <summary>
@@ -33,6 +35,7 @@ namespace Content.Shared.Movement.Systems
     /// </summary>
     public abstract partial class SharedMoverController : VirtualController
     {
+        [Dependency] private   readonly AlertsSystem _alerts = default!;
         [Dependency] private   readonly IConfigurationManager _configManager = default!;
         [Dependency] protected readonly IGameTiming Timing = default!;
         [Dependency] private   readonly IMapManager _mapManager = default!;
@@ -165,6 +168,7 @@ protected void HandleMobMovement(
             var (walkDir, sprintDir) = GetVelocityInput(mover);
             var touching = false;
 
+
             // Handle wall-pushes.
             if (weightless)
             {
@@ -285,6 +289,14 @@ protected void HandleMobMovement(
             PhysicsSystem.SetAngularVelocity(physicsUid, 0, body: physicsComponent);
         }
 
+        public void WalkingAlert(EntityUid player, bool walking)
+        {
+            if (HasComp<CanWalkComponent>(player))
+            {
+                _alerts.ShowAlert(player, AlertType.Walking, walking ? (short) 0 : (short) 1);
+            }
+        }
+
         public void LerpRotation(EntityUid uid, InputMoverComponent mover, float frameTime)
         {
             var angleDiff = Angle.ShortestDistance(mover.RelativeRotation, mover.TargetRelativeRotation);

Content.Shared/Strip/Components/ThievingComponent.cs

@@ -1,9 +1,11 @@
+using Robust.Shared.GameStates;
+
 namespace Content.Shared.Strip.Components;
 
 /// <summary>
 /// Give this to an entity when you want to decrease stripping times
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ThievingComponent : Component
 {
     /// <summary>
@@ -27,6 +29,6 @@ public sealed partial class ThievingComponent : Component
     /// <summary>
     ///  Should the user be able to see hidden items? (i.e pockets)
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool IgnoreStripHidden;
 }

Resources/Audio/Admin/Smites/bookify.ogg

@@ -0,0 +1,4 @@
+darkswapon.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+darkswapoff.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+futuristic-teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/
+teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/

Resources/Audio/Admin/Smites/manup.ogg

@@ -1,89 +1,4 @@
-- files: ["434387_Time_Lapse_of_Clouds.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "==(Time Lapse of Clouds)== by Buoy"
-  source: "https://www.newgrounds.com/audio/listen/434387"
-
-- files: ["a_different_reality_lagoona_remix.xm.ogg"]
-  license: "CC-BY-4.0"
-  copyright: "A.D.R (Lagoona rmx) by Andreas Viklund"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=134786"
-
-- files: ["aggravated.it.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "MEL -Aggravated Assault by melcom"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=176234"
-
-- files: ["autumnal_equinox.xm.ogg"]
-  license: "CC-BY-NC-4.0"
-  copyright: "Autumnal Equinox by lemonade"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=143993"
-
-- files: ["comet_haley.ogg"]
+- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]
   license: "CC-BY-NC-SA-3.0"
-  copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG."
-  source: "https://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley"
-
-- files: ["drozerix_-_alone.xm.ogg"]
-  license: "Custom"
-  copyright: "Alone by Drozerix"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=199968"
-
-- files: ["drozerix_-_leisurely_voice.xm.ogg"]
-  license: "Custom"
-  copyright: "Leisurely Voice by Drozerix"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837"
-
-- files: ["endless_space.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Endless Space by SolusLunes. Converted from MP3 to OGG."
-  source: "https://www.newgrounds.com/audio/listen/67583"
-
-- files: ["marhaba.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG."
-  source: "https://freemusicarchive.org/music/Ian_Alex_Mac/Cues/Marhaba"
-
-- files: ["melcom-cyberpunk.it.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "MEL -Cyberpunk by melcom"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=184215"
-
-- files: ["midori_-_conundrum_final.it.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "Conundrum by Midori Mizuno"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=181705"
-
-- files: ["mod.flip-flap.ogg"]
-  license: "Custom"
-  copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in this directory) and is free for non-commercial use. It was converted from MOD to WAV using Schism Tracker, in 16 Bit, Non-Interpolated mode, no output equalizer settings, Ramp volume at start of sample enabled. From there it was converted to OGG Vorbis with `ffmpeg -i flip-flap.wav -q 2.9 flip-flap-renc.ogg` (quality scale chosen to match size of the OGG file being replaced). Non-interpolated mode was chosen as the module has a high enough sample rate to balance it out, but seems muffled in other interpolation modes. If 'Ramp volume at start of sample' is not enabled, a clicking phenomenon results."
-  source: "http://aminet.net/package/mods/xceed/Flipflap"
-
-- files: ["psirius_-_nights_of_orion.xm.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "Nights of Orion by Psirius"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=184962"
-
-- files: ["psirius_-_nymphs_of_the_forest.mptm.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "Nymphs of the forest by Psirius"
-  source: "https://modarchive.org/index.php?request=view_by_moduleid&query=185545"
-
-- files: ["hackers.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Hackers by Karl Casey @ White Bat Audio"
-  source: "https://www.youtube.com/watch?v=k8nHWwO1U2Q"
-
-- files: ["superposition.ogg"]
-  license: "CC-BY-NC-3.0"
-  copyright: "Superposition by Amie Waters"
-  source: "https://amiewaters.bandcamp.com/track/superposition-2"
-
-- files: ["every_light_is_blinking_at_once.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "every light is blinking at once by Alexander Divine."
-  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
-
-- files: ["DOS=HIGH,_UMB.ogg"]
-  license: "Custom"
-  copyright: "DOS=HIGH, UMB by MASTER BOOT RECORD may be used non-commercially in the Delta-V fork of SS14. Converted from FLAC to OGG."
-  source: "https://masterbootrecord.bandcamp.com/album/c-edit-config-sys"
+  copyright: "All songs used are produced by Danya Vodovoz, royalty free."
+  source: "https://soundcloud.com/danyavodovoz"

Resources/Audio/Admin/Smites/pleaseroleplay.ogg

@@ -0,0 +1,4 @@
+- files: ["deadling.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by Bolgarich"
+  source: "https://youtu.be/q7_NFEeeEac"