Merge pull request #292 from Corvax-Frontier/Up130624

Up130624
Corvax-Frontier · Jun 13, 2024 · 81fd213 · 81fd213
2 parents 77e2c55 + 7bafecc
commit 81fd213
Show file tree

Hide file tree

Showing 45 changed files with 20,127 additions and 2,358 deletions.
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -85,7 +85,8 @@ private void OnInteractUsing(Entity<MaterialReclaimerComponent> entity, ref Inte
             return;
 
         // if we're trying to get a solution out of the reclaimer, don't destroy it
-        if (_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.SolutionContainerId, out _, out var outputSolution) && outputSolution.Contents.Any())
+        // if (_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.SolutionContainerId, out _, out var outputSolution) && outputSolution.Contents.Any()) // Frontier: previous implementation
+        if (_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.SolutionContainerId, out _, out var outputSolution)) // Frontier: do not trash solution containers if the reclaimer is empty
         {
             if (TryComp<SolutionContainerManagerComponent>(args.Used, out var managerComponent) &&
                 _solutionContainer.EnumerateSolutions((args.Used, managerComponent)).Any(s => s.Solution.Comp.Solution.AvailableVolume > 0))

diff --git a/Content.Shared/_NF/Containers/WeaponCaseInsertable.cs b/Content.Shared/_NF/Containers/WeaponCaseInsertable.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared._NF.Containers;
+
+[RegisterComponent]
+public sealed partial class WeaponCaseInsertableComponent : Component
+{
+
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4963,3 +4963,27 @@ Entries:
       message: Fixed solution transfer from syndie darts.
   id: 5028
   time: '2024-06-12T10:47:24.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: Reclaimers can now process logs and empty beakers, jugs, and buckets.
+    - type: Tweak
+      message: Reclaimers liquid storage increased to 1000u.
+  id: 5029
+  time: '2024-06-12T21:51:38.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added Salvage Outpost dungeon theme.
+    - type: Tweak
+      message: >-
+        Changed expedition loot pools: items should become slightly more scarce
+        but of better value overall.
+    - type: Tweak
+      message: Added advanced hardsuits to expedition loot pool tables.
+    - type: Tweak
+      message: Weapon cases now provide moderate explosion protection for contents.
+    - type: Fix
+      message: Fixed minor graphical error on long weapon case.
+  id: 5030
+  time: '2024-06-12T22:22:04.0000000+00:00'
diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -28,7 +28,10 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: MapGrid
@@ -3113,8 +3116,6 @@ entities:
             1004: 9.110695,42.81673
     - type: RadiationGridResistance
     - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
     - type: SpreaderGrid
 - proto: AcousticGuitarInstrument
   entities:
@@ -3245,13 +3246,6 @@ entities:
     - type: Transform
       pos: 11.5,1.5
       parent: 1
-- proto: BaseBallBat
-  entities:
-  - uid: 1875
-    components:
-    - type: Transform
-      pos: 24.683756,47.869045
-      parent: 1
 - proto: Bed
   entities:
   - uid: 1094
@@ -3305,14 +3299,6 @@ entities:
     - type: Transform
       pos: 32.5,7.5
       parent: 1
-- proto: BrokenBottle
-  entities:
-  - uid: 1876
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.557798,47.80727
-      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 42
@@ -8288,13 +8274,6 @@ entities:
     - type: Transform
       pos: 22.5,38.5
       parent: 1
-- proto: DonkpocketBoxSpawner
-  entities:
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 16.5,13.5
-      parent: 1
 - proto: DoorElectronics
   entities:
   - uid: 1069
@@ -9240,6 +9219,13 @@ entities:
     - type: Transform
       pos: 12.369425,13.798887
       parent: 1
+- proto: LandMineExplosive
+  entities:
+  - uid: 1942
+    components:
+    - type: Transform
+      pos: 2.476542,20.3592
+      parent: 1
 - proto: Lighter
   entities:
   - uid: 1215
@@ -11726,6 +11712,18 @@ entities:
     - type: Transform
       pos: 12.999242,13.625918
       parent: 1
+- proto: SpawnDungeonLootArmoryExplosives
+  entities:
+  - uid: 1876
+    components:
+    - type: Transform
+      pos: 2.4536958,20.396553
+      parent: 1
+  - uid: 1941
+    components:
+    - type: Transform
+      pos: 1.4786916,26.59427
+      parent: 1
 - proto: SpawnDungeonLootArmoryGuns
   entities:
   - uid: 281
@@ -12087,6 +12085,11 @@ entities:
     - type: Transform
       pos: 18.696524,21.493046
       parent: 1
+  - uid: 883
+    components:
+    - type: Transform
+      pos: 16.67248,13.446251
+      parent: 1
   - uid: 1902
     components:
     - type: Transform
@@ -12519,6 +12522,28 @@ entities:
     - type: Transform
       pos: 10.444371,39.695183
       parent: 1
+- proto: SpawnDungeonLootMeleeT1
+  entities:
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 25.679262,47.681923
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      pos: 24.585531,47.681923
+      parent: 1
+  - uid: 1470
+    components:
+    - type: Transform
+      pos: 4.934014,8.558511
+      parent: 1
+  - uid: 1875
+    components:
+    - type: Transform
+      pos: 5.662302,7.92888
+      parent: 1
 - proto: SpawnDungeonLootMugs
   entities:
   - uid: 598