Merge branch 'new-frontiers-14:master' into Bodycam-Rework

new-frontiers-14 · Sep 15, 2023 · 3857940 · 3857940
2 parents 8486cab + 830a0f7
commit 3857940
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 15 deletions.
diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
@@ -73,7 +73,7 @@ private void UpdateController(EntityUid uid, TimeSpan curTime, AmeControllerComp
             if (TryComp<PowerSupplierComponent>(uid, out var powerOutlet))
                 powerOutlet.MaxSupply = powerOutput;
             fuelJar.FuelAmount -= availableInject;
-            _audioSystem.PlayPvs(controller.InjectSound, uid, AudioParams.Default.WithVolume(overloading ? 10f : 0f));
+            _audioSystem.PlayPvs(controller.InjectSound, uid, AudioParams.Default.WithVolume(overloading ? 5f : -5f));
             UpdateUi(uid, controller);
         }
 

diff --git a/Content.Server/_NF/Commands/GhostRespawnCommand.cs b/Content.Server/_NF/Commands/GhostRespawnCommand.cs
@@ -51,12 +51,12 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         var mindSystem = _entityManager.EntitySysManager.GetEntitySystem<MindSystem>();
-        if (!mindSystem.TryGetMind(shell.Player, out _, out var mind))
+        if (!mindSystem.TryGetMind(shell.Player, out _, out _))
         {
             shell.WriteLine("You have no mind.");
             return;
         }
-        var time = (_gameTiming.CurTime - mind.TimeOfDeath!.Value);
+        var time = (_gameTiming.CurTime - ghost.TimeOfDeath);
         var respawnTime = _configurationManager.GetCVar(NF14CVars.RespawnTime);
 
         if (respawnTime > time.TotalSeconds)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -677,3 +677,17 @@ Entries:
         might show up on your ships.
   id: 67
   time: '2023-09-14T05:33:20.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Tweak
+      message: >-
+        AME controllers now have noise-cancelling shielding to help curb space
+        madness
+  id: 68
+  time: '2023-09-15T03:55:32.0000000+00:00'
+- author: checkraze
+  changes:
+    - type: Tweak
+      message: Asteroids are now much larger and richer
+  id: 69
+  time: '2023-09-15T05:23:26.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -14,32 +14,53 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorAsteroidSand:
+          - id: RandomArtifactSpawner20
+            prob: 0.03
+            orGroup: rock
           - id: WallRock
-            prob: 0.5
+            prob: 0.3
             orGroup: rock
           - id: WallRockTin
-            prob: 0.15
+            prob: 0.2
             orGroup: rock
           - id: WallRockQuartz
-            prob: 0.15
+            prob: 0.1
             orGroup: rock
           - id: WallRockGold
-            prob: 0.05
+            prob: 0.06
             orGroup: rock
           - id: WallRockSilver
-            prob: 0.05
+            prob: 0.04
             orGroup: rock
           - id: WallRockPlasma
-            prob: 0.05
+            prob: 0.07
             orGroup: rock
           - id: WallRockUranium
-            prob: 0.02
+            prob: 0.04
             orGroup: rock
           - id: WallRockBananium
-            prob: 0.02
+            prob: 0.03
             orGroup: rock
           - id: WallRockArtifactFragment
-            prob: 0.01
+            prob: 0.03
+            orGroup: rock
+          - id: SalvageMobSpawner
+            prob: 0.001
+            orGroup: rock
+          - id: SpawnMobBearSalvage
+            prob: 0.001
+            orGroup: rock
+          - id: SpawnMobSpiderSalvage
+            prob: 0.001
+            orGroup: rock
+          - id: SpawnMobKangarooSalvage
+            prob: 0.001
+            orGroup: rock
+          - id: SpawnMobSmallPurpleSnake
+            prob: 0.001
+            orGroup: rock
+          - id: SpawnMobPurpleSnake
+            prob: 0.001
             orGroup: rock
     - type: GCAbleObject
       queue: SpaceDebris
@@ -65,7 +86,7 @@
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
-      floorPlacements: 16
+      floorPlacements: 24
 
 - type: entity
   id: AsteroidDebrisLarge
@@ -75,7 +96,7 @@
   components:
     - type: MapGrid
     - type: BlobFloorPlanBuilder
-      floorPlacements: 24
+      floorPlacements: 36
 
 - type: entity
   id: AsteroidDebrisLarger
@@ -86,7 +107,18 @@
     - type: MapGrid
     - type: BlobFloorPlanBuilder
       radius: 12
-      floorPlacements: 36
+      floorPlacements: 48
+
+- type: entity
+  id: AsteroidDebrisHuge
+  parent: BaseAsteroidDebris
+  name: Asteroid Debris Huge
+  noSpawn: true
+  components:
+    - type: MapGrid
+    - type: BlobFloorPlanBuilder
+      radius: 32
+      floorPlacements: 128
 
 - type: entity
   id: AsteroidSalvageSmall

diff --git a/Resources/Prototypes/World/Biomes/basic.yml b/Resources/Prototypes/World/Biomes/basic.yml
@@ -13,6 +13,8 @@
           prob: 0.7
         - id: AsteroidDebrisLarger
           prob: 0.4
+        - id: AsteroidDebrisHuge
+          prob: 0.2
     - type: NoiseDrivenDebrisSelector
       noiseChannel: Wreck
       debrisTable: