Merge remote-tracking branch 'origin/january-vanilla-upstream-merge' …

…into january-vanilla-upstream-merge
new-frontiers-14 · Feb 4, 2024 · bc5e23f · bc5e23f
2 parents f5568e1 + a156129
commit bc5e23f
Show file tree

Hide file tree

Showing 162 changed files with 134,377 additions and 121,051 deletions.
diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.DoAfter;
+using Content.Server.DoAfter;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.Power.Generator;
@@ -39,6 +39,14 @@ public override void Initialize()
         SubscribeLocalEvent<PortableGeneratorComponent, PortableGeneratorSwitchOutputMessage>(GeneratorSwitchOutputMessage);
 
         SubscribeLocalEvent<FuelGeneratorComponent, SwitchPowerCheckEvent>(OnSwitchPowerCheck);
+
+        SubscribeLocalEvent<PortableGeneratorComponent, MapInitEvent>(GeneratorMapInit); // Frontier
+    }
+
+    private void GeneratorMapInit(EntityUid uid, PortableGeneratorComponent component, MapInitEvent args) // Frontier - Init on map generator
+    {
+        if (component.StartOnMapInit)
+            _generator.SetFuelGeneratorOn(uid, true);
     }
 
     private void GeneratorSwitchOutputMessage(EntityUid uid, PortableGeneratorComponent component, PortableGeneratorSwitchOutputMessage args)

diff --git a/Content.Server/Puppet/VentriloquistPuppetSystem.cs b/Content.Server/Puppet/VentriloquistPuppetSystem.cs
@@ -5,12 +5,14 @@
 using Content.Server.Speech.Muting;
 using Content.Shared.CombatMode;
 using Content.Shared.Hands;
+using Robust.Shared.Random;
 
 namespace Content.Server.Puppet
 {
     public sealed class VentriloquistPuppetSystem : SharedVentriloquistPuppetSystem
     {
         [Dependency] private readonly PopupSystem _popupSystem = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
 
         public override void Initialize()
         {
@@ -36,22 +38,27 @@ private void OnUseInHand(EntityUid uid, VentriloquistPuppetComponent component,
 
             if (!RemComp<MutedComponent>(uid))
             {
-                _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-remove-hand"), uid, args.User);
+                _popupSystem.PopupEntity(Loc.GetString(_random.Pick(component.RemoveHand)), uid, args.User); // Frontier
+                //_popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-remove-hand"), uid, args.User);
                 MuteDummy(uid, component);
                 return;
             }
 
             // TODO why does this need a combat component???
             EnsureComp<CombatModeComponent>(uid);
-            _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-insert-hand"), uid, args.User);
-            _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-inserted-hand"), uid, uid);
+            _popupSystem.PopupEntity(Loc.GetString(_random.Pick(component.InsertHand)), uid, args.User); // Frontier
+            _popupSystem.PopupEntity(Loc.GetString(_random.Pick(component.InsertedHand)), uid, uid); // Frontier
+            // _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-insert-hand"), uid, args.User);
+            // _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-inserted-hand"), uid, uid);
 
             if (!HasComp<GhostTakeoverAvailableComponent>(uid))
             {
                 AddComp<GhostTakeoverAvailableComponent>(uid);
                 var ghostRole = EnsureComp<GhostRoleComponent>(uid);
-                ghostRole.RoleName = Loc.GetString("ventriloquist-puppet-role-name");
-                ghostRole.RoleDescription = Loc.GetString("ventriloquist-puppet-role-description");
+                ghostRole.RoleName = Loc.GetString(_random.Pick(component.PuppetRoleName)); // Frontier
+                ghostRole.RoleDescription = Loc.GetString(_random.Pick(component.PuppetRoleDescription)); // Frontier
+                //ghostRole.RoleName = Loc.GetString("ventriloquist-puppet-role-name");
+                //ghostRole.RoleDescription = Loc.GetString("ventriloquist-puppet-role-description");
             }
 
             args.Handled = true;
@@ -65,7 +72,8 @@ private void OnDropped(EntityUid uid, VentriloquistPuppetComponent component, Dr
             if (HasComp<MutedComponent>(uid))
                 return;
 
-            _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-remove-hand"), uid, args.User);
+            _popupSystem.PopupEntity(Loc.GetString(_random.Pick(component.RemoveHand)), uid, args.User); // Frontier
+            //_popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-remove-hand"), uid, args.User);
             MuteDummy(uid, component);
         }
 
@@ -77,7 +85,8 @@ private void OnUnequippedHand(EntityUid uid, VentriloquistPuppetComponent compon
             if (HasComp<MutedComponent>(uid))
                 return;
 
-            _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-remove-hand"), uid, args.User);
+            _popupSystem.PopupEntity(Loc.GetString(_random.Pick(component.RemoveHand)), uid, args.User); // Frontier
+            //_popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-remove-hand"), uid, args.User);
             MuteDummy(uid, component);
         }
 
@@ -86,7 +95,8 @@ private void OnUnequippedHand(EntityUid uid, VentriloquistPuppetComponent compon
         /// </summary>
         private void MuteDummy(EntityUid uid, VentriloquistPuppetComponent component)
         {
-            _popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-removed-hand"), uid, uid);
+            _popupSystem.PopupEntity(Loc.GetString(_random.Pick(component.RemovedHand)), uid, uid); // Frontier
+            //_popupSystem.PopupEntity(Loc.GetString("ventriloquist-puppet-removed-hand"), uid, uid);
             EnsureComp<MutedComponent>(uid);
             RemComp<CombatModeComponent>(uid);
             RemComp<GhostTakeoverAvailableComponent>(uid);

diff --git a/Content.Server/_NF/SizeAttribute/SizeAttributeSystem.cs b/Content.Server/_NF/SizeAttribute/SizeAttributeSystem.cs
@@ -71,6 +71,9 @@ private void Scale(EntityUid uid, SizeAttributeComponent component, float scale,
             {
                 foreach (var (id, fixture) in manager.Fixtures)
                 {
+                    if (!fixture.Hard || fixture.Density <= 1f)
+                        continue; // This will skip the flammable fixture and any other fixture that is not supposed to contribute to mass
+
                     switch (fixture.Shape)
                     {
                         case PhysShapeCircle circle:

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -227,7 +227,7 @@ public static readonly CVarDef<bool>
         ///     Whether a random position offset will be applied to the station on roundstart.
         /// </summary>
         public static readonly CVarDef<bool> StationOffset =
-            CVarDef.Create("game.station_offset", true);
+            CVarDef.Create("game.station_offset", false);
 
         /// <summary>
         /// When the default blueprint is loaded what is the maximum amount it can be offset from 0,0.

diff --git a/Content.Shared/Power/Generator/FuelGeneratorComponent.cs b/Content.Shared/Power/Generator/FuelGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Power.Generator;
 

diff --git a/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs b/Content.Shared/Power/Generator/SharedPortableGeneratorComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Power.Generator;
@@ -42,6 +42,12 @@ public sealed partial class PortableGeneratorComponent : Component
     [DataField("startSoundEmpty")]
     [ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier? StartSoundEmpty { get; set; }
+
+    /// <summary>
+    /// Frontier - Start the generator with the map.
+    /// </summary>
+    [DataField("startOnMapInit")]
+    public bool StartOnMapInit { get; set; } = false;
 }
 
 /// <summary>

diff --git a/Content.Shared/Puppet/VentriloquistPuppetComponent.cs b/Content.Shared/Puppet/VentriloquistPuppetComponent.cs
@@ -5,4 +5,21 @@ namespace Content.Shared.Puppet;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class VentriloquistPuppetComponent : Component
 {
-}
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<LocId> RemoveHand = new ();
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<LocId> RemovedHand = new();
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<LocId> InsertHand = new ();
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<LocId> InsertedHand = new ();
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<LocId> PuppetRoleName = new ();
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<LocId> PuppetRoleDescription = new ();
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3134,3 +3134,61 @@ Entries:
       message: Updated SV Nugget to current mapping standards.
   id: 4793
   time: '2024-01-30T16:39:36.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: >-
+        NanoTrasen cloning facilities no longer cause tall lizards, small
+        vulpkanin, and tall felinids to have their body weight doubled.
+  id: 4794
+  time: '2024-01-31T14:32:30.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added pilot's mask, pilot's webbing.
+  id: 4795
+  time: '2024-01-31T15:15:04.0000000+00:00'
+- author: TsjipTsjip
+  changes:
+    - type: Tweak
+      message: >-
+        NFSD Outpost should now be practicing proper social distancing towards
+        Frontier Outpost.
+  id: 4796
+  time: '2024-02-02T00:56:13.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NM Pulse to current mapping standards.
+  id: 4797
+  time: '2024-02-02T18:48:50.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated NM Helix to current mapping standards.
+  id: 4798
+  time: '2024-02-02T18:49:05.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Updated (and slightly reworked) NR Sparrow to current mapping standards.
+  id: 4799
+  time: '2024-02-02T23:12:12.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: Added clown & mime gear to AutoDrob.
+  id: 4800
+  time: '2024-02-03T17:56:47.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: Added small gyro and thrusters to cargo and sci tech.
+  id: 4801
+  time: '2024-02-03T17:58:48.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Emotional support cats can now swap hats (Mail, Pirate, Chef)
+  id: 4802
+  time: '2024-02-03T17:59:55.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl
@@ -3,3 +3,9 @@ ent-CrateThruster = { ent-BaseThruster }
 
 ent-CrateGyroscope = { ent-Gyroscope }
     .desc = { ent-Gyroscope.desc }
+
+ent-CrateSmallThruster = { ent-SmallThruster }
+    .desc = { ent-BaseThruster.desc }
+
+ent-CrateSmallGyroscope = { ent-SmallGyroscope }
+    .desc = { ent-Gyroscope.desc }
diff --git a/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl b/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl
@@ -0,0 +1,5 @@
+ent-SmallThruster = small thruster
+    .desc = { ent-BaseThruster.desc }
+
+ent-SmallGyroscope = small gyroscope
+    .desc = { ent-Gyroscope.desc }
diff --git a/Resources/Locale/en-US/_NF/ventriloquist/ventriloquist.ftl b/Resources/Locale/en-US/_NF/ventriloquist/ventriloquist.ftl
@@ -0,0 +1,7 @@
+ventriloquist-rock-grasp-hand = You firmly grasp the pet rock.
+ventriloquist-rock-release-hand = You release your grip on the pet rock.
+
+ventriloquist-rock-grasped-hand  = You have been grasped.
+ventriloquist-rock-released-hand  = You been released.
+ventriloquist-rock-role-name = A pet rock
+ventriloquist-rock-role-description = You are a pet mineral.