Merge branch 'develop' into 'feature/atm-system'

# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
2019-03-10 10:49:51 +01:00
parent 5bf613bac4
commit 6feb19b8d3
15 changed files with 1332 additions and 86 deletions
--- a/ReallifeGamemode.Server/Main.cs
+++ b/ReallifeGamemode.Server/Main.cs
@@ -46,6 +46,7 @@ namespace ReallifeGamemode.Server
            BusinessManager.LoadBusinesses();
            InteriorManager.LoadInteriors();
            DoorManager.LoadDoors();
+            ATMManager.InitATMs();


            TempBlip tempBlip = new TempBlip()