Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -73,7 +73,7 @@ namespace Barotrauma
{
get
{
if (level.BeaconStation == null)
if (level.BeaconStation == null || state > 0)
{
yield break;
}
@@ -95,9 +95,10 @@ namespace Barotrauma
foreach (Item item in Item.ItemList)
{
if (!connectedSubs.Contains(item.Submarine) || item.Submarine?.Info is { IsPlayer: true }) { continue; }
if (item.GetComponent<PowerTransfer>() != null ||
bool isReactor = item.GetComponent<Reactor>() != null;
if ((isReactor && GameMain.GameSession is not { TraitorsEnabled: true }) ||
item.GetComponent<PowerTransfer>() != null ||
item.GetComponent<PowerContainer>() != null ||
item.GetComponent<Reactor>() != null ||
item.GetComponent<Sonar>() != null)
{
item.InvulnerableToDamage = true;