Merge branch 'shark-race-real' of https://github.com/BlitzTheSquishy/…

…Delta-v into shark-race-real

.github/labeler.yml

@@ -39,3 +39,6 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.swsl'
 
+"Changes: Audio":
+- changed-files:
+  - any-glob-to-any-file: '**/*.ogg'

Content.Server/DeltaV/StationEvents/Components/GlimmerMobRuleComponent.cs

@@ -17,6 +17,12 @@ public sealed partial class GlimmerMobRuleComponent : Component
     [DataField(required: true)]
     public EntProtoId MobPrototype = string.Empty;
 
+    /// <summary>
+    /// Hard cap on spawns, regardless of glimmer or psionics.
+    /// </summary>
+    [DataField]
+    public int? MaxSpawns;
+
     /// <summary>
     /// Every this number of psionics spawns 1 mob.
     /// </summary>

Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs

@@ -29,6 +29,8 @@ protected override void Started(EntityUid uid, GlimmerMobRuleComponent comp, Gam
         int multiplier = Math.Max(1, (int) _glimmer.GetGlimmerTier() - (int) comp.GlimmerTier);
 
         var total = baseCount * multiplier;
+        if (comp.MaxSpawns is {} maxSpawns)
+            total = Math.Min(total, maxSpawns);
 
         Log.Info($"Spawning {total} of {comp.MobPrototype} from {ToPrettyString(uid):rule}");
         for (var i = 0; i < total; i++)

Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs

@@ -23,6 +23,9 @@ public sealed partial class OracleComponent : Component
     [DataField("barkTime")]
     public TimeSpan BarkTime = TimeSpan.FromMinutes(1);
 
+    [DataField]
+    public OracleBarkType BarkType = OracleBarkType.Never;
+
     [DataField("rejectAccumulator")]
     public float RejectAccumulator;
 
@@ -85,3 +88,9 @@ public sealed partial class OracleComponent : Component
         "CrystalNormality",
     };
 }
+
+public enum OracleBarkType: byte {
+    Timed,
+    NewDemand,
+    Never
+}

Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs

@@ -41,14 +41,16 @@ public override void Update(float frameTime)
         foreach (var oracle in EntityQuery<OracleComponent>())
         {
             oracle.Accumulator += frameTime;
-            oracle.BarkAccumulator += frameTime;
             oracle.RejectAccumulator += frameTime;
-            if (oracle.BarkAccumulator >= oracle.BarkTime.TotalSeconds)
+
+            if (oracle.BarkType == OracleBarkType.Timed)
             {
-                oracle.BarkAccumulator = 0;
-                var message = Loc.GetString(_random.Pick(oracle.DemandMessages), ("item", oracle.DesiredPrototype.Name))
-                    .ToUpper();
-                _chat.TrySendInGameICMessage(oracle.Owner, message, InGameICChatType.Speak, false);
+                oracle.BarkAccumulator += frameTime;
+                if (oracle.BarkAccumulator >= oracle.BarkTime.TotalSeconds)
+                {
+                    oracle.BarkAccumulator = 0;
+                    SendBark(oracle);
+                }
             }
 
             if (oracle.Accumulator >= oracle.ResetTime.TotalSeconds)
@@ -208,6 +210,17 @@ private void NextItem(OracleComponent component)
             component.DesiredPrototype = proto;
         else
             Logger.Error("Oracle can't index prototype " + protoString);
+
+        if (component.BarkType == OracleBarkType.NewDemand)
+        {
+            SendBark(component);
+        }
+    }
+
+    private void SendBark(OracleComponent component) {
+        var message = Loc.GetString(_random.Pick(component.DemandMessages), ("item", component.DesiredPrototype.Name))
+            .ToUpper();
+        _chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, false);
     }
 
     private string GetDesiredItem(OracleComponent component)

Content.Shared/Doors/Systems/SharedFirelockSystem.cs

@@ -21,7 +21,8 @@ public override void Initialize()
 
         // Access/Prying
         SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
-        SubscribeLocalEvent<FirelockComponent, BeforePryEvent>(OnBeforePry);
+        // DeltaV: commented out to let people pry powered firelocks by hand
+        //SubscribeLocalEvent<FirelockComponent, BeforePryEvent>(OnBeforePry);
         SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
         SubscribeLocalEvent<FirelockComponent, PriedEvent>(OnAfterPried);
 

Resources/Audio/Lobby/attributions.yml

@@ -107,3 +107,9 @@
   license: "CC0-1.0"
   copyright: "The Station by A-Guy, converted from mp3 to OGG"
   source: "https://github.com/A-Guy173/Music/blob/main/thestation.mp3"
+
+- files: ["Get_It_Done.ogg"]
+  license: "CC0-1.0"
+  copyright: "Get It Done by A-Guy, converted from mp3 to OGG"
+  source: "https://github.com/A-Guy173/Music/blob/main/getitdone.mp3"
+

Resources/Changelog/DeltaVChangelog.yml

@@ -1,56 +1,4 @@
 Entries:
-- author: ps3moira
-  changes:
-  - message: Added two new paintings.
-    type: Add
-  id: 54
-  time: '2023-10-10T03:42:19.0000000+00:00'
-- author: leonardo_dabepis
-  changes:
-  - message: Changed how the revenant looks.
-    type: Tweak
-  id: 55
-  time: '2023-10-10T03:48:16.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-  - message: Holy water and bibles now deal Holy damage to unholy creatures.
-    type: Add
-  id: 56
-  time: '2023-10-10T03:55:34.0000000+00:00'
-- author: ps3moira
-  changes:
-  - message: Skull Size
-    type: Tweak
-  id: 57
-  time: '2023-10-10T04:12:19.0000000+00:00'
-- author: TJohnson
-  changes:
-  - message: Added new vests to play to replace most of the Type I vests in organic
-      play.
-    type: Add
-  - message: Removed most of the Type I vests in organic play. Some might still crop
-      up, but don't count on it!
-    type: Remove
-  id: 58
-  time: '2023-10-10T04:43:44.0000000+00:00'
-- author: ps3moira
-  changes:
-  - message: Station Holograph
-    type: Add
-  id: 59
-  time: '2023-10-11T00:00:46.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-  - message: Added shock collar, Mystagogue's bible and the fish labeler.
-    type: Add
-  id: 60
-  time: '2023-10-11T03:26:21.0000000+00:00'
-- author: Leonardo DaBepis
-  changes:
-  - message: Gave the Courier a new uniform and cap.
-    type: Tweak
-  id: 61
-  time: '2023-10-12T17:31:11.0000000+00:00'
 - author: rosieposieeee
   changes:
   - message: Added Paramedic airlocks.
@@ -3592,3 +3540,67 @@
   id: 553
   time: '2024-09-17T03:49:20.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1840
+- author: deltanedas
+  changes:
+  - message: Made the random sentience event a glimmer event.
+    type: Tweak
+  - message: Fixed glimmer events never running.
+    type: Fix
+  id: 554
+  time: '2024-09-17T05:44:14.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1834
+- author: Beck Thompson
+  changes:
+  - message: The "Die a glorious death" objective is now limited to one traitor per
+      round maximum!
+    type: Tweak
+  id: 555
+  time: '2024-09-17T05:47:55.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1819
+- author: Fox
+  changes:
+  - message: New Lobby Track "Get It Done" by A-Guy
+    type: Add
+  id: 556
+  time: '2024-09-17T14:02:13.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1766
+- author: DisposableCrewmember42
+  changes:
+  - message: Shut the oracle up. Scientists may now research in peace.
+    type: Tweak
+  id: 557
+  time: '2024-09-17T14:09:06.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1786
+- author: deltanedas
+  changes:
+  - message: You no longer need a crowbar to pry powered firelocks open.
+    type: Tweak
+  id: 558
+  time: '2024-09-17T23:11:28.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1837
+- author: Adei, ErhardSteinhauer, Aikakakah
+  changes:
+  - message: Tweaked wooden tiles so they go with the rest of wood chairs / items
+      more.
+    type: Tweak
+  - message: Decals are now no longer offset by one pixel!
+    type: Tweak
+  - message: You can now build more secret doors.
+    type: Add
+  id: 559
+  time: '2024-09-18T05:11:08.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1842
+- author: Radezolid
+  changes:
+  - message: Nuclear operatives fire axe is no longer able to pry plating.
+    type: Fix
+  id: 560
+  time: '2024-09-18T08:57:33.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1844
+- author: dge21
+  changes:
+  - message: added a sweet new drink for the bar to serve
+    type: Add
+  id: 561
+  time: '2024-09-18T09:38:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1780

Resources/ConfigPresets/DeltaV/deltav.toml

@@ -6,14 +6,14 @@ round_end_pacifist = true
 contraband_examine = false # Doubtful that it's desired at all, and would require going over every item in accordance with SOP
 
 [infolinks]
-discord    = "https://go.delta-v.org/sxzqj"
+discord    = "https://discord.gg/deltav"
 github     = "https://github.com/DeltaV-Station/Delta-v"
-website    = "https://www.delta-v.org/"
+#website    = "https://www.delta-v.org/"
 wiki       = "https://wiki.delta-v.org/view/Main_Page"
-patreon    = "https://www.patreon.com/Delta_v"
+#patreon    = "https://www.patreon.com/Delta_v"
 bug_report = "https://github.com/DeltaV-Station/Delta-v/issues/new/choose"
-forum      = "https://forum.delta-v.org/"
-appeal     = "https://go.delta-v.org/appeal"
+#forum      = "https://forum.delta-v.org/"
+appeal     = "https://discord.gg/deltav"
 
 [net]
 max_connections = 1024

Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl

@@ -28,6 +28,7 @@ flavor-complex-healthcodeviolation = ominous
 flavor-complex-blellow = like an impossible color
 flavor-complex-candy-strawberry = like strawberries
 flavor-complex-candy-bubblegum = like bubble gum
+flavor-complex-double-ice-cream = like ice cream, twice
 
 candy-flavor-profile = This one is supposed to taste {$flavor}.
 candy-flavor-profile-multiple = This one is supposed to taste {$flavors} and {$lastFlavor}.

Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl

@@ -21,3 +21,6 @@ reagent-desc-healthviolation = Allegedly it's a cocktail. The warning cone motif
 
 reagent-name-mothamphetamine = mothamphetamine
 reagent-desc-mothamphetamine = A strangely... fuzzy drink. It has a chaotic aura.
+
+reagent-name-double-ice-cream = Double Ice Cream
+reagent-desc-double-ice-cream = Ice cream, but now with even more ice cream on top. It doesn't get any sweeter than this!