Merge branch 'master' into january-vanilla-upstream-merge

new-frontiers-14 · Feb 3, 2024 · 3fd16f8 · 3fd16f8
2 parents cb8e1b1 + 0f150bf
commit 3fd16f8
Show file tree

Hide file tree

Showing 51 changed files with 2,132 additions and 1,393 deletions.
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/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3134,3 +3134,43 @@ 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'
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -5363,6 +5363,11 @@ entities:
     - pos: 49.5,12.5
       parent: 2173
       type: Transform
+  - uid: 4926
+    components:
+    - pos: 46.5,14.5
+      parent: 2173
+      type: Transform
 - proto: AirlockMaintEngiLocked
   entities:
   - uid: 4131
@@ -16011,9 +16016,9 @@ entities:
       type: Transform
 - proto: ClosetL3JanitorFilled
   entities:
-  - uid: 2142
+  - uid: 3062
     components:
-    - pos: -3.5,21.5
+    - pos: -3.5,20.5
       parent: 2173
       type: Transform
 - proto: ClosetMaintenanceFilledRandom
@@ -16467,10 +16472,9 @@ entities:
       type: Transform
 - proto: ComputerWallmountBankATM
   entities:
-  - uid: 6007
+  - uid: 2136
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,29.5
+    - pos: 3.5,29.5
       parent: 2173
       type: Transform
     - containers:
@@ -16483,10 +16487,9 @@ entities:
           occludes: True
           ents: []
       type: ContainerContainer
-  - uid: 6008
+  - uid: 2140
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 51.5,27.5
+    - pos: 51.5,27.5
       parent: 2173
       type: Transform
     - containers:
@@ -16499,10 +16502,9 @@ entities:
           occludes: True
           ents: []
       type: ContainerContainer
-  - uid: 6009
+  - uid: 2141
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 51.5,4.5
+    - pos: 51.5,4.5
       parent: 2173
       type: Transform
     - containers:
@@ -16515,10 +16517,9 @@ entities:
           occludes: True
           ents: []
       type: ContainerContainer
-  - uid: 6012
+  - uid: 2142
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,27.5
+    - pos: 17.5,27.5
       parent: 2173
       type: Transform
     - containers:
@@ -16830,13 +16831,6 @@ entities:
     - links:
       - 6145
       type: DeviceLinkSink
-- proto: CrateServiceJanitorialSupplies
-  entities:
-  - uid: 2140
-    components:
-    - pos: -3.5,24.5
-      parent: 2173
-      type: Transform
 - proto: CrewMonitoringServer
   entities:
   - uid: 3059
@@ -20511,27 +20505,13 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: FoodDonutChocolate
-  entities:
-  - uid: 3062
-    components:
-    - pos: 35.340572,9.907843
-      parent: 2173
-      type: Transform
 - proto: FoodDonutJellySpaceman
   entities:
   - uid: 4289
     components:
     - pos: 20.420221,10.579422
       parent: 2173
       type: Transform
-- proto: FoodDonutPink
-  entities:
-  - uid: 2136
-    components:
-    - pos: 35.585506,9.649889
-      parent: 2173
-      type: Transform
 - proto: FoodPizzaMoldySlice
   entities:
   - uid: 4407
@@ -30226,10 +30206,9 @@ entities:
       type: Transform
 - proto: JanitorialTrolley
   entities:
-  - uid: 2141
+  - uid: 4925
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,20.5
+    - pos: -3.5,22.5
       parent: 2173
       type: Transform
 - proto: LampGold
@@ -36029,11 +36008,6 @@ entities:
     - pos: -5.5,13.5
       parent: 2173
       type: Transform
-  - uid: 3054
-    components:
-    - pos: 46.5,15.5
-      parent: 2173
-      type: Transform
 - proto: VendingMachineCuraDrobe
   entities:
   - uid: 4249
@@ -36054,9 +36028,7 @@ entities:
   entities:
   - uid: 2143
     components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -3.5,22.5
+    - pos: -3.5,24.5
       parent: 2173
       type: Transform
 - proto: VendingMachineLawDrobe
@@ -39030,12 +39002,6 @@ entities:
       pos: -2.5,28.5
       parent: 2173
       type: Transform
-  - uid: 761
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 46.5,14.5
-      parent: 2173
-      type: Transform
   - uid: 798
     components:
     - pos: 35.5,22.5
@@ -39845,6 +39811,18 @@ entities:
       pos: -46.5,15.5
       parent: 2173
       type: Transform
+- proto: WallWeaponCapacitorRecharger
+  entities:
+  - uid: 761
+    components:
+    - pos: -28.5,13.5
+      parent: 2173
+      type: Transform
+  - uid: 3054
+    components:
+    - pos: 9.5,22.5
+      parent: 2173
+      type: Transform
 - proto: WardrobeGreyFilled
   entities:
   - uid: 2435
@@ -39888,6 +39866,13 @@ entities:
     - pos: -5.5,20.5
       parent: 2173
       type: Transform
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 4924
+    components:
+    - pos: 35.5,9.5
+      parent: 2173
+      type: Transform
 - proto: WeaponPistolMk58
   entities:
   - uid: 4380