Merge branch 'metrostroi-repo:dev' into dev

lua/autorun/metrostroi.lua

@@ -354,7 +354,7 @@ if SERVER then
             if not pcall(require,"turbostroi") then
                 if system.IsWindows() then
                     ErrorNoHalt("======================================================\nMetrostroi: Turbostroi library can't be loaded because of missing libraries!\nCheck, that you have Microsoft visual c++ 2010 and 2017 redistributable(x86) installed\nYou can download it from:\n")
-                    MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe\n")
+                    MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=26999 (2010 x86)\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe (2017 x86)\n")
                     ErrorNoHalt("======================================================\n")
                 else
                     ErrorNoHalt("Metrostroi: Turbostroi library can't be loaded!\n")
@@ -366,7 +366,7 @@ if SERVER then
 			if not pcall(require,"turbostroi") then
                 if system.IsWindows() then
                     ErrorNoHalt("======================================================\nMetrostroi: Turbostroi library can't be loaded because of missing libraries!\nCheck, that you have Microsoft visual c++ 2010 and 2017 redistributable(x64) installed\nYou can download it from:\n")
-                    MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x64.exe\n")
+                    MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=26999 (2010 x64)\nhttps://aka.ms/vs/15/release/vc_redist.x64.exe (2017 x64)\n")
                     ErrorNoHalt("======================================================\n")
                 else
                     ErrorNoHalt("Metrostroi: Turbostroi library can't be loaded!\n")
@@ -378,7 +378,7 @@ if SERVER then
             ErrorNoHalt("======================================================\nMetrostroi: Turbostroi DLL not found.\nYou can found turbostroi for Windows at \n")
             MsgC(Color(255,0,0),"https://metrostroi.net/turbostroi\n")
             ErrorNoHalt("Just place this .dll to garrysmod/lua/bin folder.\nIf bin folder doesn't exists - create it.\nDon't forget to install Microsoft visual c++ 2010 and 2017 redistributable(x86)\nYou can download it from:\n")
-            MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=5555\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe\n")
+            MsgC(Color(255,0,0),"https://www.microsoft.com/en-us/download/details.aspx?id=26999 (2010 x86)\nhttps://aka.ms/vs/15/release/vc_redist.x86.exe (2017 x86)\n")
             ErrorNoHalt("======================================================\n")
         else
             ErrorNoHalt("Metrostroi: Turbostroi DLL not found.\n")

lua/entities/gmod_track_udochka/init.lua

@@ -22,13 +22,15 @@ local function removeWeldBetweenEnts(ent1,ent2)
 	end
 end
 function ENT:Use(ply)
-	if self.Coupled then
+	if IsValid(self.Coupled) then
 		sound.Play("buttons/lever8.wav",self:GetPos())
 		removeWeldBetweenEnts(self,self.Coupled)
 		removeWeldBetweenEnts(self.Coupled,self)
 
+		self.Coupled.Connectors[self.ConnectorID] = nil
 		self.Timer = CurTime()+2
 	end
+	self.ConnectorID = nil
 	self.Coupled = nil
 	if ( self:IsPlayerHolding() ) then return end
 	if ply.PickupObject then ply:PickupObject( self ) end

lua/entities/gmod_train_bogey/init.lua

@@ -392,16 +392,10 @@ function ENT:CheckContact(pos,dir,id,cpos)
                 traceEnt:SetPos(self:LocalToWorld(cpos))
                 traceEnt:SetAngles(self:GetAngles())
                 traceEnt.Coupled = self
+                traceEnt.ConnectorID = id
                 sound.Play("udochka_connect.wav",traceEnt:GetPos())
                 self.Connectors[id] = traceEnt
                 DropEntityIfHeld(traceEnt)
-                --[[timer.Simple(0,function()
-                    if not IsValid(traceEnt) or not traceEnt:IsPlayerHolding()  then return end
-                    traceEnt:ForcePlayerDrop()
-                    if traceEnt.LastPickup and traceEnt.LastPickup:IsPlayer()  then
-                        traceEnt.LastPickup:DropObject()
-                    end
-                end)]]
             end
         end
         return false

lua/metrostroi/maps/loopline.lua

@@ -571,9 +571,9 @@ Metrostroi.StationConfigurations = {
         }
     },
     pto = {
-        pto = {"пто","ПТО"},
+        names = {"пто","ПТО"},
         positions = {
             {Vector(-4539,5624,-4597),Angle(0,0,0)},
         }
     }
-}
+}