Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

2022-04-11 15:58:36 -03:00
parent 290a8bb5ae 72328c29cb
commit 0cf4edbecf
38 changed files with 361 additions and 184 deletions
@@ -4170,6 +4170,12 @@ namespace Barotrauma
                    selectedPrefab.GiveItems(corpse, wreck);
                    corpse.Kill(CauseOfDeathType.Unknown, causeOfDeathAffliction: null, log: false);
                    corpse.GiveIdCardTags(sp);
+#if SERVER
+                    if (selectedPrefab.MinMoney >= 0 && selectedPrefab.MaxMoney > 0)
+                    {
+                        corpse.Wallet.Give(Rand.Range(selectedPrefab.MinMoney, selectedPrefab.MaxMoney, Rand.RandSync.Unsynced));
+                    }
+#endif
                    spawnCounter++;

                    static CorpsePrefab GetCorpsePrefab(Func<CorpsePrefab, bool> predicate)