Merge branch 'master' into 2024-04-03-Punk-Stuff

new-frontiers-14 · Apr 27, 2024 · eb95ff9 · eb95ff9
2 parents f68758e + 74d5c51
commit eb95ff9
Show file tree

Hide file tree

Showing 216 changed files with 14,999 additions and 8,921 deletions.
diff --git a/.github/mapchecker/config.py b/.github/mapchecker/config.py
@@ -29,5 +29,9 @@
     ],
     "Syndicate": [
         "Plastitanium",  # And also on blackmarket ships cause syndicate.
-    ]
+    ],
+	"BlackMarket": [
+        "Plastitanium",  # And also on blackmarket ships cause syndicate.
+        "ButtonFrameCautionSecurity",  # Decal.
+	]
 }
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -212,7 +212,7 @@ public void TrySendInGameICMessage(
         }
 
         bool shouldCapitalize = (desiredType != InGameICChatType.Emote);
-        bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation) && (desiredType != InGameICChatType.Emote);
+        bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation);
         // Capitalizing the word I only happens in English, so we check language here
         bool shouldCapitalizeTheWordI = (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en")
             || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en");

diff --git a/Content.Server/Speech/Components/GoblinAccentComponent.cs b/Content.Server/Speech/Components/GoblinAccentComponent.cs
@@ -0,0 +1,7 @@
+using Content.Server.Speech.EntitySystems;
+
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(GoblinAccentSystem))]
+public sealed partial class GoblinAccentComponent : Component {}
diff --git a/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs b/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Speech.Components;
+using Robust.Shared.Random;
+using System.Text.RegularExpressions;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class GoblinAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GoblinAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    // converts left word when typed into the right word. For example typing you becomes ye.
+    public string Accentuate(string message, GoblinAccentComponent component)
+    {
+        var msg = message;
+
+        msg = _replacement.ApplyReplacements(msg, "goblin");
+        return msg;
+    }
+
+    private void OnAccentGet(EntityUid uid, GoblinAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}
diff --git a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs b/Content.Server/_NF/Goblin/Components/GoblinComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Goblin.Components;
+
+[RegisterComponent]
+public sealed partial class GoblinComponent : Component
+{
+
+}
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared._NF.LoggingExtensions;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
@@ -237,7 +238,12 @@ private void Insert(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? use
 
             // Logging
             if (inserted != null && inserted.Value && user != null)
-                _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user.Value)} inserted {ToPrettyString(item)} into {slot.ContainerSlot?.ID + " slot of "}{ToPrettyString(uid)}");
+            {
+                // Frontier modification: adds extra things to the log
+                var extraLogs = LoggingExtensions.GetExtraLogs(EntityManager, item);
+
+                _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user.Value)} inserted {ToPrettyString(item)}{extraLogs} into {slot.ContainerSlot?.ID + " slot of "}{ToPrettyString(uid)}");
+            }
 
             _audioSystem.PlayPredicted(slot.InsertSound, uid, excludeUserAudio ? user : null);
         }

diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -1,3 +1,4 @@
+using Content.Shared._NF.LoggingExtensions;
 using Content.Shared.Database;
 using Content.Shared.Hands.Components;
 using Content.Shared.Item;
@@ -223,7 +224,10 @@ public virtual void DoPickup(EntityUid uid, Hand hand, EntityUid entity, HandsCo
             return;
         }
 
-        _adminLogger.Add(LogType.Pickup, LogImpact.Low, $"{ToPrettyString(uid):user} picked up {ToPrettyString(entity):entity}");
+        // Frontier modification: adds extra things to the log
+        var extraLogs = LoggingExtensions.GetExtraLogs(EntityManager, entity);
+
+        _adminLogger.Add(LogType.Pickup, LogImpact.Low, $"{ToPrettyString(uid):user} picked up {ToPrettyString(entity):entity}{extraLogs}");
 
         Dirty(uid, hands);
 

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared._NF.LoggingExtensions;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Logs;
@@ -419,7 +420,11 @@ public void InteractHand(EntityUid user, EntityUid target)
             // all interactions should only happen when in range / unobstructed, so no range check is needed
             var message = new InteractHandEvent(user, target);
             RaiseLocalEvent(target, message, true);
-            _adminLogger.Add(LogType.InteractHand, LogImpact.Low, $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target}");
+
+            // Frontier modification: adds extra things to the log
+            var extraLogs = LoggingExtensions.GetExtraLogs(EntityManager, target);
+
+            _adminLogger.Add(LogType.InteractHand, LogImpact.Low, $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target}{extraLogs}");
             DoContactInteraction(user, target, message);
             if (message.Handled)
                 return;
@@ -1047,7 +1052,12 @@ public void DroppedInteraction(EntityUid user, EntityUid item)
             var dropMsg = new DroppedEvent(user);
             RaiseLocalEvent(item, dropMsg, true);
             if (dropMsg.Handled)
-                _adminLogger.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(user):user} dropped {ToPrettyString(item):entity}");
+            {
+                // Frontier modification: adds extra things to the log
+                var extraLogs = LoggingExtensions.GetExtraLogs(EntityManager, item);
+
+                _adminLogger.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(user):user} dropped {ToPrettyString(item):entity}{extraLogs}");
+            }
 
             // If the dropper is rotated then use their targetrelativerotation as the drop rotation
             var rotation = Angle.Zero;

diff --git a/Content.Shared/_NF/LoggingExtensions/LoggingExtensions.cs b/Content.Shared/_NF/LoggingExtensions/LoggingExtensions.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Stacks;
+
+namespace Content.Shared._NF.LoggingExtensions;
+
+public static class LoggingExtensions
+{
+    public static string GetExtraLogs(EntityManager entityManager, EntityUid entity)
+    {
+        // Get details from the stack component to track amount of things in the stack.
+        if (entityManager.TryGetComponent<StackComponent>(entity, out var stack))
+        {
+            return $"(StackCount: {stack.Count.ToString()})";
+        }
+
+        // Add more logging things here when needed.
+
+        return "";
+    }
+}
diff --git a/Resources/Audio/_NF/Voice/Goblin/attributions.yml b/Resources/Audio/_NF/Voice/Goblin/attributions.yml
@@ -0,0 +1,32 @@
+- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
+- files: ["goblin-cackle-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/spookymodem/sounds/202096/"
+- files: ["goblin-cackle-05.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
+  source: "https://freesound.org/people/Nanakisan/sounds/253532/"
+- files: ["goblin-scream-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
+- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/Duisterwho/sounds/643497/"
+- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: https://freesound.org/people/SnowFightStudios/sounds/643657/
+- files: ["goblin-chatter-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  source: https://freesound.org/people/Fenodyrie/sounds/565923/
+- files: ["goblin-hiss-01.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg
diff --git a/Resources/Audio/_NF/Voice/Goblin/license.txt b/Resources/Audio/_NF/Voice/Goblin/license.txt
@@ -0,0 +1,32 @@
+- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
+- files: ["goblin-cackle-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/spookymodem/sounds/202096/"
+- files: ["goblin-cackle-05.ogg"]
+  license: "CC BY 4.0"
+  copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
+  source: "https://freesound.org/people/Nanakisan/sounds/253532/"
+- files: ["goblin-scream-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
+- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/Duisterwho/sounds/643497/"
+- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: https://freesound.org/people/SnowFightStudios/sounds/643657/
+- files: ["goblin-chatter-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  source: https://freesound.org/people/Fenodyrie/sounds/565923/
+- files: ["goblin-hiss-01.ogg"]
+  license: "CC BY 4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
diff --git a/Resources/Audio/_NF/Vulpikanin/bark.ogg b/Resources/Audio/_NF/Vulpikanin/bark.ogg
diff --git a/Resources/Audio/_NF/Vulpikanin/growl1.ogg b/Resources/Audio/_NF/Vulpikanin/growl1.ogg
diff --git a/Resources/Audio/_NF/Vulpikanin/growl2.ogg b/Resources/Audio/_NF/Vulpikanin/growl2.ogg
diff --git a/Resources/Audio/_NF/Vulpikanin/growl3.ogg b/Resources/Audio/_NF/Vulpikanin/growl3.ogg
diff --git a/Resources/Audio/_NF/Vulpikanin/howl.ogg b/Resources/Audio/_NF/Vulpikanin/howl.ogg
diff --git a/Resources/Audio/_NF/Vulpikanin/scream1.ogg b/Resources/Audio/_NF/Vulpikanin/scream1.ogg
diff --git a/Resources/Audio/_NF/Vulpikanin/scream2.ogg b/Resources/Audio/_NF/Vulpikanin/scream2.ogg
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4213,3 +4213,87 @@ Entries:
       message: Updated NSF Inquisitor.
   id: 4936
   time: '2024-04-25T02:57:06.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Adds the Bocakillo, pirate ship.
+  id: 4937
+  time: '2024-04-25T05:36:54.0000000+00:00'
+- author: Kesiath
+  changes:
+    - type: Tweak
+      message: Temporarily restored Spacelaw books.
+  id: 4938
+  time: '2024-04-26T04:16:05.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Added storage compartment to Skeleton Bike.
+    - type: Tweak
+      message: It is possible to strap a duffel bag to ATV now.
+    - type: Tweak
+      message: ATV hull color is now randomized.
+    - type: Add
+      message: Added void-capable hoverbike. Buy one at cargo today!
+    - type: Add
+      message: Added void-capable hoverbikes for NFSD and Mail Carrier.
+  id: 4939
+  time: '2024-04-26T04:32:41.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Mail carrier hoverbike flatpack that can be bought from vendomat. and
+        NFSD 
+    - type: Add
+      message: >-
+        NFSD hoverbike flatpack that can be bought from uplink (utility
+        category).
+    - type: Remove
+      message: >-
+        Removed hoverbikes from cargo catalog. Will be added to expedition loot
+        pool at some point.
+  id: 4940
+  time: '2024-04-26T16:58:44.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: Empress got a new coat of paint along with the microships.
+  id: 4941
+  time: '2024-04-26T18:23:05.0000000+00:00'
+- author: Gotimanga
+  changes:
+    - type: Tweak
+      message: 'Tweaked the NSF Wasp and changed it to the new NSFD colours '
+  id: 4942
+  time: '2024-04-26T20:49:17.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Revamped ICR Chisel.
+    - type: Tweak
+      message: Enabled additional recipes in salvage techfab.
+  id: 4943
+  time: '2024-04-26T21:27:00.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Reworked the NSF Interceptor and brought it up to date.
+  id: 4944
+  time: '2024-04-26T22:05:51.0000000+00:00'
+- author: GreaseMonk
+  changes:
+    - type: Tweak
+      message: Add more info about stack count to entity logs
+  id: 4945
+  time: '2024-04-27T12:36:33.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added new species - Goblins.
+    - type: Add
+      message: Added new accent - Goblins Cant.
+    - type: Add
+      message: Added new decoration piece - Goblinkind Banner.
+  id: 4946
+  time: '2024-04-27T14:58:41.0000000+00:00'