Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-03-13 13:32:14 -03:00
parent 3fe775405c b5ecaf0194
commit 4a229c6427
335 changed files with 11052 additions and 5179 deletions
@@ -696,6 +696,7 @@ namespace Barotrauma
            {
                msg.WriteIdentifier(MerchantIdentifier);
            }
+            msg.WriteIdentifier(Faction);

            int msgLengthBeforeOrders = msg.LengthBytes;
            // Current orders