Merge branch 'master' into pirates

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -86,7 +86,6 @@ public sealed class PostMapInitTest
             "Oasis",
             "Cog",
             // ADT-Start
-            "ADT_Frontier",
             "ADT_Astra",
             "ADT_Avrit",
             "ADT_Bagel",
@@ -112,7 +111,6 @@ public sealed class PostMapInitTest
             // ADT-End
 
             // ADT-Halloween-Start
-            "ADT_FrontierHalloween",
             "ADT_TrainHalloween",
             "ADT_SalternHalloween",
             // ADT-Halloween-End
@@ -122,7 +120,6 @@ public sealed class PostMapInitTest
             "ADT_BoxNewYear",
             "ADT_Cluster_LegacyNewYear",
             "ADT_DeltaNewYear",
-            "ADT_FrontierNewYear",
             "ADT_GeminiNewYear",
             "ADT_PieNewYear",
             "ADT_SalternNewYear"

Content.Shared/ADT/CCVar/CCVars.cs

@@ -18,5 +18,24 @@ public sealed class SimpleStationCCVars
         CVarDef.Create("silicon.npcupdatetime", 1.5f, CVar.SERVERONLY);
     #endregion Silicons
 
+    /*
+    * Jetpack
+    */
+    #region Jetpack System
+
+    /// <summary>
+    ///     When true, Jetpacks can be enabled anywhere, even in gravity.
+    /// </summary>
+    public static readonly CVarDef<bool> JetpackEnableAnywhere =
+        CVarDef.Create("jetpack.enable_anywhere", false, CVar.REPLICATED);
+
+    /// <summary>
+    ///     When true, jetpacks can be enabled on grids that have zero gravity.
+    /// </summary>
+    public static readonly CVarDef<bool> JetpackEnableInNoGravity =
+        CVarDef.Create("jetpack.enable_in_no_gravity", true, CVar.REPLICATED);
+
+    #endregion
+
 
 }

Content.Shared/Movement/Systems/SharedJetpackSystem.cs

@@ -1,9 +1,11 @@
 using Content.Shared.Actions;
+using Content.Shared.ADT.CCVar;
 using Content.Shared.Gravity;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
+using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
@@ -20,6 +22,7 @@ public abstract class SharedJetpackSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
 
     public override void Initialize()
     {
@@ -127,8 +130,13 @@ private bool CanEnableOnGrid(EntityUid? gridUid)
     {
         // No and no again! Do not attempt to activate the jetpack on a grid with gravity disabled. You will not be the first or the last to try this.
         // https://discord.com/channels/310555209753690112/310555209753690112/1270067921682694234
-        return gridUid == null ||
-               (!HasComp<GravityComponent>(gridUid));
+
+        // ADT Tweak start
+        if (gridUid == null || !TryComp<GravityComponent>(gridUid, out var comp))
+            return true;
+
+        return !comp.Enabled;
+        // ADT Tweak End
     }
 
     private void OnJetpackGetAction(EntityUid uid, JetpackComponent component, GetItemActionsEvent args)

Content.Shared/Revenant/Components/RevenantComponent.cs

@@ -274,7 +274,7 @@ public sealed partial class RevenantComponent : Component
     /// The amount of essence that is needed to use the ability.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("smokeCost")]
-    public FixedPoint2 SmokeCost = -30;
+    public FixedPoint2 SmokeCost = 30;
 
     /// <summary>
     /// The status effects applied after the ability

Resources/Audio/ADT/Jukebox/NewYear/attributions.yml

@@ -0,0 +1,23 @@
+- files: ["roa-music-winter-magic.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "by Roa Music | https://soundcloud.com/roa_music1031 Music promoted by https://www.free-stock-music.com. Converted to mono ogg"
+  source: "https://www.free-stock-music.com/roa-music-winter-magic.html"
+
+- files: ["the-piano-says-yuletide.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "by The Piano Says | https://soundcloud.com/thepianosays https://spoti.fi/3uvxbRU Music promoted by https://www.free-stock-music.com. Converted to mono ogg"
+  source: "https://www.free-stock-music.com/the-piano-says-yuletide.html"
+
+- files: ["maxkomusic-christmas-is-coming.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "by MaxKoMusic | https://maxkomusic.com/ Music promoted by https://www.free-stock-music.com. Converted to mono ogg"
+  source: "https://www.free-stock-music.com/maxkomusic-christmas-is-coming.html"
+
+- files:
+  - alex-productions-christmas-countdown-deck-the-halls.ogg
+  - alex-productions-christmas-is-coming.ogg
+  - alex-productions-christmas-mood.ogg
+  - alex-productions-christmas-vibes.ogg
+  license: "CC-BY-3.0"
+  copyright: "by Alex-Productions | https://onsound.eu/ Music promoted by https://www.free-stock-music.com. Converted to mono ogg"
+  source: "https://www.free-stock-music.com"

Resources/Audio/ADT/Jukebox/attributions.yml

@@ -7,3 +7,15 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "Created for ADT by discord: conjurerq"
   source: "https://github.com/AdventureTimeSS14/space_station_ADT/pull/800"
+
+- files: ["fsm-team-eagle.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "by FSM team https://www.free-stock-music.com. Converted to mono ogg"
+  source: "https://www.free-stock-music.com/fsm-team-eagle.html"
+
+- files:
+  - fsm-team-escp-midnight-room.ogg
+  - fsm-team-escp-neonscapes.ogg
+  license: "CC-BY-3.0"
+  copyright: "by | e s c p | https://www.escp.space https://escp-music.bandcamp.com. Converted to mono ogg"
+  source: "https://www.free-stock-music.com"

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl

@@ -10,7 +10,7 @@ ent-ADTClothingUniformJumpskirtTurtleneckBlueshield = юбка-водолазк
 
 
 ent-ADTClothingUniformJumpskirtTurtleneckBlack = чёрная водолазка с юбкой
-    .desc = { ent-ADTClothingUniformTurtleneckBlack.desc }
+    .desc = Любимая одежда книжного червя.
     .suffix = { "" }
 
 

Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/god.ftl

@@ -0,0 +1,13 @@
+ent-MobForgottenGodBase = Забытый Бог
+    .desc = Ваш разум закипает и бурлит, пытаясь осмыслить увиденное.
+ent-MobForgottenGodSpawn = { ent-MobForgottenGodBase }
+    .desc = { ent-MobForgottenGodBase.desc }
+ent-MobForgottenGod = { ent-MobForgottenGodBase }
+    .desc = { ent-MobForgottenGodBase.desc }
+
+ent-MobForgottenGodSpawnAnnounce = { ent-MobForgottenGodBase }
+    .desc = { ent-MobForgottenGodBase.desc }
+ent-MobForgottenGodAnnounce = { ent-MobForgottenGodBase }
+    .desc = { ent-MobForgottenGodBase.desc }
+
+forgotten-has-risen = Целостность пространства и времени нарушена... Из бездонной червоточины Нечто пробралось в наш мир.

Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl

@@ -20,8 +20,8 @@ ent-ADTMandarinSeeds = пакет семян мандарина
     .desc = Ох, скорей бы выросли!
     .suffix = Новый год
 # семяна
-seeds-mandarin-name = мандарина
-seeds-mandarin-display-name = мандарина
+seeds-mandarin-name = мандарин
+seeds-mandarin-display-name = мандарин
 # сок
 reagent-name-juice-mandarin = мандариновый сок
 reagent-desc-juice-mandarin = И вкусно, и богато витамином C. Чего ещё желать?