From 1fdf1181617149e232a95e8cccd1445d67d2b85d Mon Sep 17 00:00:00 2001
From: Moon Horse <akaikangaroo@gmail.com>
Date: Sat, 13 Dec 2025 02:21:34 +0300
Subject: [PATCH] Reviewer's notes completed; ru-en translation added

---
 .../gmod_subway_81-714_lvz/cl_init.lua        | 124 +++++------
 lua/entities/gmod_subway_81-714_lvz/init.lua  |   2 +-
 .../gmod_subway_81-714_mvm/cl_init.lua        | 130 +++++------
 lua/entities/gmod_subway_81-714_mvm/init.lua  |   2 +-
 .../gmod_subway_81-717_lvz/cl_init.lua        | 129 ++++++-----
 lua/entities/gmod_subway_81-717_lvz/init.lua  |   2 +-
 .../gmod_subway_81-717_mvm/cl_init.lua        | 136 ++++++------
 lua/entities/gmod_subway_81-717_mvm/init.lua  |   6 +-
 .../systems/sys_81_717_pneumatic.lua          | 108 +++++----
 lua/metrostroi_data/languages/en_717.lua      | 208 +++++++++---------
 lua/metrostroi_data/languages/ru_717.lua      | 208 +++++++++---------
 11 files changed, 524 insertions(+), 531 deletions(-)

diff --git a/lua/entities/gmod_subway_81-714_lvz/cl_init.lua b/lua/entities/gmod_subway_81-714_lvz/cl_init.lua
index 70ea7a1..2744ffd 100644
--- a/lua/entities/gmod_subway_81-714_lvz/cl_init.lua
+++ b/lua/entities/gmod_subway_81-714_lvz/cl_init.lua
@@ -409,18 +409,15 @@ for i,button in pairs(ENT.ButtonMap.AV_T.buttons) do
 end
 -- ДВР()
 ENT.ButtonMap["DVR_87"] = {
-    pos = Vector(448,-53,-28),
-    ang = Angle(0,180,-5),
-    width = 1000,
-    height = 300,
+    pos = Vector(438,-37,-38),
+    ang = Angle(0,180,127),
+    width = 187,
+    height = 80,
     scale = 0.0625,
     hide=0.8,
 
     buttons = {
-        {ID = "DVRDisconnectToggle", x=0, y=0, w=1000, h=300, tooltip="", model = {
-            var="DVRDisconnect",sndid="disconnect_valve",--"brake_disconnect",
-            sndvol = 1, snd = function(val) return "disconnect_valve" end,
-            sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
+        {ID = "DVRDisconnectToggle", x=0, y=0, w=187, h=80, tooltip="",var="DVRDisconnect",states={"Train.Buttons.Opened","Train.Buttons.Closed"},
         },   
     }
 }
@@ -428,7 +425,7 @@ ENT.ClientSounds["DVRDisconnect"] = {{"DVR_disconnect",function() return "discon
 
 ENT.ClientProps["DVR_disconnect"] = {
     model = "models/metrostroi_train/81-707/cran1.mdl",
-    pos = Vector(431.15,-43.5,-24.7),
+    pos = Vector(431.15,-43.5,-32.7),
     ang = Angle(-90,0,-90),
     hideseat=0.2,
 }
@@ -603,7 +600,7 @@ ENT.ClientProps["door2"] = {
     hide=2,
 }
 --Выключение дверей ()
-ENT.ButtonMap["Doors1_2_left"] = {
+ENT.ButtonMap["DoorsLeft1_2"] = {
     pos = Vector(-387,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -614,11 +611,11 @@ ENT.ButtonMap["Doors1_2_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door4Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor4Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft1_2"] = {
     pos = Vector(-317.5,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -629,16 +626,16 @@ ENT.ButtonMap["bldr1_2_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock4",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock4",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_left"] = {
+ENT.ButtonMap["DoorsLeft3_4"] = {
     pos = Vector(-156.5,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -649,11 +646,11 @@ ENT.ButtonMap["Doors3_4_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door3Set",x=300,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor3Set",x=300,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft3_4"] = {
     pos = Vector(-87.4,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -664,16 +661,16 @@ ENT.ButtonMap["bldr3_4_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock3",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock3",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_left"] = {
+ENT.ButtonMap["DoorsLeft5_6"] = {
     pos = Vector(73,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -684,11 +681,11 @@ ENT.ButtonMap["Doors5_6_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door2Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor2Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft5_6"] = {
     pos = Vector(142.7,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -699,16 +696,16 @@ ENT.ButtonMap["bldr5_6_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock2",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock2",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors7_8_left"] = {
+ENT.ButtonMap["DoorsLeft7_8"] = {
     pos = Vector(302,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -719,11 +716,11 @@ ENT.ButtonMap["Doors7_8_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door1Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door1Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor1Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor1Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft7_8"] = {
     pos = Vector(372.8,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -734,16 +731,16 @@ ENT.ButtonMap["bldr7_8_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock1",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock1",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors1_2_right"] = {
+ENT.ButtonMap["DoorsRight1_2"] = {
     pos = Vector(-389,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -754,11 +751,11 @@ ENT.ButtonMap["Doors1_2_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door5Set",x=324,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door5Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor5Set",x=324,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor5Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight1_2"] = {
     pos = Vector(-317.5,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -769,16 +766,16 @@ ENT.ButtonMap["bldr1_2_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock5",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock5",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_right"] = {
+ENT.ButtonMap["DoorsRight3_4"] = {
     pos = Vector(-156.6,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -789,11 +786,11 @@ ENT.ButtonMap["Doors3_4_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door6Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door6Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor6Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor6Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight3_4"] = {
     pos = Vector(-87.5,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -804,16 +801,16 @@ ENT.ButtonMap["bldr3_4_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock6",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock6",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_right"] = {
+ENT.ButtonMap["DoorsRight5_6"] = {
     pos = Vector(72,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -824,11 +821,11 @@ ENT.ButtonMap["Doors5_6_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door7Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door7Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor7Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor7Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight5_6"] = {
     pos = Vector(142.56,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -839,16 +836,16 @@ ENT.ButtonMap["bldr5_6_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock7",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock7",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors7_8_right"] = {
+ENT.ButtonMap["DoorsRight7_8"] = {
     pos = Vector(302,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -859,11 +856,11 @@ ENT.ButtonMap["Doors7_8_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door8Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door8Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor8Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor8Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight7_8"] = {
     pos = Vector(372.7,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -874,9 +871,9 @@ ENT.ButtonMap["bldr7_8_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock8",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock8",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
@@ -895,7 +892,7 @@ ENT.ButtonMap["DoorReleaseRight"] = {
 
     buttons = {
         {ID = "DoorReleaseRightToggle",x=0,y=0,w= 100,h = 40,tooltip="",model = {
-            var="DoorReleaseRight",sndid="doorsmanual_r",
+            var="DoorReleaseRight",sndid="doorsmanual_r",states={"Train.Buttons.Closed","Train.Buttons.Opened"},
             sndvol = 1,snd = function(val) return "disconnect_valve" end,
             sndmin = 90,sndmax = 1e3,sndang = Angle(-90,0,0),}},
     }
@@ -922,7 +919,7 @@ ENT.ButtonMap["DoorReleaseLeft"] = {
 
     buttons = {
         {ID = "DoorReleaseLeftToggle",x=0,y=0,w= 100,h = 40,tooltip="",model = {
-            var="DoorReleaseLeft",sndid="doorsmanual_l",
+            var="DoorReleaseLeft",sndid="doorsmanual_l",states={"Train.Buttons.Closed","Train.Buttons.Opened"},
             sndvol = 1,snd = function(val) return "disconnect_valve" end,
             sndmin = 90,sndmax = 1e3,sndang = Angle(-90,0,0),}},
     }
@@ -1274,12 +1271,6 @@ function ENT:Think()
             self.ClientEnts.seats_new_cap:SetSubMaterial(0,self.NewBlueSeats and "models/metrostroi_train/81-717/interior_kvr_blue" or "")
         end
     end
-    --()
-    local DrawDVR = self:GetPackedBool("CouchCap")
-    self:ShowHide("DVR_disconnect",DrawDVR)
-    self:HidePanel("DVR_87",not DrawDVR)
-    self:Animate("DVR_disconnect",self:GetPackedBool("DVRDisconnect") and 1 or 0,0.25,0,  4,false)
-    --()
 
     local Bortlamp_w = self:Animate("Bortlamp_w",self:GetPackedBool("DoorsW") and 1 or 0,0,1,16,false)
     local Bortlamp_g = self:Animate("Bortlamp_g",self:GetPackedBool("GRP") and 1 or 0,0,1,16,false)
@@ -1595,6 +1586,9 @@ function ENT:DrawPost()
     self:DrawOnPanel("AirDistributor",function()
         draw.DrawText(self:GetNW2Bool("AD") and "Air Distributor ON" or "Air Distributor OFF","Trebuchet24",0,0,Color(0,0,0,255))
     end)
+    self:DrawOnPanel("DVR_87",function()
+        draw.DrawText(self:GetNW2Bool("DVR") and "DVR ON" or "DVR OFF","ContentHeader",0,0,Color(60,70,70,255))
+    end)
 end
 function ENT:OnPlay(soundid,location,range,pitch)
     if location == "stop" then
diff --git a/lua/entities/gmod_subway_81-714_lvz/init.lua b/lua/entities/gmod_subway_81-714_lvz/init.lua
index cd9407d..9bfd141 100644
--- a/lua/entities/gmod_subway_81-714_lvz/init.lua
+++ b/lua/entities/gmod_subway_81-714_lvz/init.lua
@@ -6,7 +6,7 @@ ENT.BogeyDistance = 650 -- Needed for gm trainspawner
 ENT.SyncTable = {
     "A53","A56","A54","A24","A39","A23","A14","A13","A31","A32","A16","A12","A49","A15","A27","A50","A8","A52","A19","A10","A22","A30","A1","A2","A3","A4","A5","A6","A72","A38","A20","A25","A37","A55","A45","A66","A51","A65","A28",
     "A70","A81","A80","A18",
-    "VB","GV","door_lock1","door_lock2","door_lock3","door_lock4","door_lock5","door_lock6","door_lock7","door_lock8",
+    "VB","GV","DoorLock1","DoorLock2","DoorLock3","DoorLock4","DoorLock5","DoorLock6","DoorLock7","DoorLock8",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","ParkingBrake","DVRDisconnect","DoorReleaseLeft","DoorReleaseRight",
     "A84","BPSNon","ConverterProtection","L_1","Start","VozvratRP","EmergencyBrakeValve"
 }
diff --git a/lua/entities/gmod_subway_81-714_mvm/cl_init.lua b/lua/entities/gmod_subway_81-714_mvm/cl_init.lua
index 804b5b0..1604b08 100644
--- a/lua/entities/gmod_subway_81-714_mvm/cl_init.lua
+++ b/lua/entities/gmod_subway_81-714_mvm/cl_init.lua
@@ -412,18 +412,19 @@ for i,button in pairs(ENT.ButtonMap.AV_T.buttons) do
 end
 -- ДВР()
 ENT.ButtonMap["DVR_87"] = {
-    pos = Vector(448,-53,-28),
-    ang = Angle(0,180,-5),
-    width = 1000,
-    height = 300,
+    pos = Vector(438,-37,-38),
+    ang = Angle(0,180,127),
+    width = 187,
+    height = 80,
     scale = 0.0625,
     hide=0.8,
 
     buttons = {
-        {ID = "DVRDisconnectToggle", x=0, y=0, w=1000, h=300, tooltip="", model = {
-            var="DVRDisconnect",sndid="disconnect_valve",--"brake_disconnect",
-            sndvol = 1, snd = function(val) return "disconnect_valve" end,
-            sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
+        {ID = "DVRDisconnectToggle", x=0, y=0, w=187, h=80, tooltip="",var="DVRDisconnect",states={"Train.Buttons.Opened","Train.Buttons.Closed"},
+        --model = {
+        --    var="DVRDisconnect",sndid="disconnect_valve",--"brake_disconnect",
+        --    sndvol = 1, snd = function(val) return "disconnect_valve" end,
+        --    sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
         },   
     }
 }
@@ -431,7 +432,7 @@ ENT.ClientSounds["DVRDisconnect"] = {{"DVR_disconnect",function() return "discon
 
 ENT.ClientProps["DVR_disconnect"] = {
     model = "models/metrostroi_train/81-707/cran1.mdl",
-    pos = Vector(431.15,-43.5,-24.7),
+    pos = Vector(431.15,-43.5,-32.7),
     ang = Angle(-90,0,-90),
     hideseat=0.2,
 }
@@ -612,7 +613,7 @@ ENT.ClientProps["door2"] = {
 }
 
 --Выключение дверей ()
-ENT.ButtonMap["Doors1_2_left"] = {
+ENT.ButtonMap["DoorsLeft1_2"] = {
     pos = Vector(-387,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -623,11 +624,11 @@ ENT.ButtonMap["Doors1_2_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door4Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor4Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft1_2"] = {
     pos = Vector(-317.5,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -638,16 +639,16 @@ ENT.ButtonMap["bldr1_2_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock4",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock4",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_left"] = {
+ENT.ButtonMap["DoorsLeft3_4"] = {
     pos = Vector(-156.5,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -658,11 +659,11 @@ ENT.ButtonMap["Doors3_4_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door3Set",x=300,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor3Set",x=300,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft3_4"] = {
     pos = Vector(-87.4,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -673,16 +674,16 @@ ENT.ButtonMap["bldr3_4_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock3",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock3",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_left"] = {
+ENT.ButtonMap["DoorsLeft5_6"] = {
     pos = Vector(73,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -693,11 +694,11 @@ ENT.ButtonMap["Doors5_6_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door2Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor2Set",x=304,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft5_6"] = {
     pos = Vector(142.7,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -708,16 +709,16 @@ ENT.ButtonMap["bldr5_6_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock2",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock2",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors7_8_left"] = {
+ENT.ButtonMap["DoorsLeft7_8"] = {
     pos = Vector(302,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -728,11 +729,11 @@ ENT.ButtonMap["Doors7_8_left"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door1Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door1Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor1Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor1Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft7_8"] = {
     pos = Vector(372.8,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -743,16 +744,16 @@ ENT.ButtonMap["bldr7_8_lft"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock1",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock1",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors1_2_right"] = {
+ENT.ButtonMap["DoorsRight1_2"] = {
     pos = Vector(-389,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -763,11 +764,11 @@ ENT.ButtonMap["Doors1_2_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door5Set",x=324,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door5Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor5Set",x=324,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor5Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight1_2"] = {
     pos = Vector(-317.5,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -778,16 +779,16 @@ ENT.ButtonMap["bldr1_2_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock5",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock5",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_right"] = {
+ENT.ButtonMap["DoorsRight3_4"] = {
     pos = Vector(-156.6,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -798,11 +799,11 @@ ENT.ButtonMap["Doors3_4_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door6Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door6Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor6Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor6Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight3_4"] = {
     pos = Vector(-87.5,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -813,16 +814,16 @@ ENT.ButtonMap["bldr3_4_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock6",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock6",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_right"] = {
+ENT.ButtonMap["DoorsRight5_6"] = {
     pos = Vector(72,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -833,11 +834,11 @@ ENT.ButtonMap["Doors5_6_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door7Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door7Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor7Set",x=312,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor7Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight5_6"] = {
     pos = Vector(142.56,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -848,16 +849,16 @@ ENT.ButtonMap["bldr5_6_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock7",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock7",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors7_8_right"] = {
+ENT.ButtonMap["DoorsRight7_8"] = {
     pos = Vector(302,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -868,11 +869,11 @@ ENT.ButtonMap["Doors7_8_right"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "open_door8Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door8Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "OpenDoor8Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor8Set",x=0,y=0,w= 100,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight7_8"] = {
     pos = Vector(372.7,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -883,9 +884,9 @@ ENT.ButtonMap["bldr7_8_rgh"] = {
     screenHide = true,
 
     buttons = {
-        {ID = "door_lock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock8",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock8",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
@@ -904,7 +905,7 @@ ENT.ButtonMap["DoorReleaseRight"] = {
 
     buttons = {
         {ID = "DoorReleaseRightToggle",x=0,y=0,w= 100,h = 40,tooltip="",model = {
-            var="DoorReleaseRight",sndid="doorsmanual_r",
+            var="DoorReleaseRight",sndid="doorsmanual_r",states={"Train.Buttons.Closed","Train.Buttons.Opened"},
             sndvol = 1,snd = function(val) return "disconnect_valve" end,
             sndmin = 90,sndmax = 1e3,sndang = Angle(-90,0,0),}},
     }
@@ -931,7 +932,7 @@ ENT.ButtonMap["DoorReleaseLeft"] = {
 
     buttons = {
         {ID = "DoorReleaseLeftToggle",x=0,y=0,w= 100,h = 40,tooltip="",model = {
-            var="DoorReleaseLeft",sndid="doorsmanual_l",
+            var="DoorReleaseLeft",sndid="doorsmanual_l",states={"Train.Buttons.Closed","Train.Buttons.Opened"},
             sndvol = 1,snd = function(val) return "disconnect_valve" end,
             sndmin = 90,sndmax = 1e3,sndang = Angle(-90,0,0),}},
     }
@@ -1303,10 +1304,10 @@ function ENT:Think()
         self.PassSchemesDone = true
     end
     --()
-    local DrawDVR = self:GetPackedBool("CouchCap")
-    self:ShowHide("DVR_disconnect",DrawDVR)
-    self:HidePanel("DVR_87",not DrawDVR)
-    self:Animate("DVR_disconnect",self:GetPackedBool("DVRDisconnect") and 1 or 0,0.25,0,  4,false)
+    --local DrawDVR = self:GetPackedBool("CouchCap")
+    --self:ShowHide("DVR_disconnect",DrawDVR)
+    --self:HidePanel("DVR_87",not DrawDVR)
+    --self:Animate("DVR_disconnect",self:GetPackedBool("DVRDisconnect") and 1 or 0,0.25,0,  4,false)
     --()
 
     local Bortlamp_w = self:Animate("Bortlamp_w",self:GetPackedBool("DoorsW") and 1 or 0,0,1,16,false)
@@ -1647,6 +1648,9 @@ function ENT:DrawPost()
     self:DrawOnPanel("AirDistributor",function()
         draw.DrawText(self:GetNW2Bool("AD") and "Air Distributor ON" or "Air Distributor OFF","Trebuchet24",0,0,Color(0,0,0,255))
     end)
+    self:DrawOnPanel("DVR_87",function()
+        draw.DrawText(self:GetNW2Bool("DVR") and "DVR ON" or "DVR OFF","ContentHeader",0,0,Color(60,70,70,255))
+    end)
 end
 function ENT:OnPlay(soundid,location,range,pitch)
     if location == "stop" then
diff --git a/lua/entities/gmod_subway_81-714_mvm/init.lua b/lua/entities/gmod_subway_81-714_mvm/init.lua
index d75377f..3b6f576 100644
--- a/lua/entities/gmod_subway_81-714_mvm/init.lua
+++ b/lua/entities/gmod_subway_81-714_mvm/init.lua
@@ -9,7 +9,7 @@ ENT.SyncTable = {
     "A22","A30","A1","A2","A3","A4","A5","A6","A72","A38","A20",
     "A25","A37","A55","A45","A66","A51","A65","A28","A70","AV2",
     "AV3","AV4","AV5","A81","AV6","A80","A18",
-    "VB","GV","door_lock1","door_lock2","door_lock3","door_lock4","door_lock5","door_lock6","door_lock7","door_lock8",
+    "VB","GV","DoorLock1","DoorLock2","DoorLock3","DoorLock4","DoorLock5","DoorLock6","DoorLock7","DoorLock8",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","ParkingBrake","DVRDisconnect","DoorReleaseLeft","DoorReleaseRight",
     "A84","BPSNon","ConverterProtection","L_1","OtklBV","Start","VozvratRP","EmergencyBrakeValve"
 }
diff --git a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua
index 97ae539..b9629ec 100644
--- a/lua/entities/gmod_subway_81-717_lvz/cl_init.lua
+++ b/lua/entities/gmod_subway_81-717_lvz/cl_init.lua
@@ -2439,26 +2439,22 @@ ENT.ButtonMap["AutostopValve"] = {
 }
 -- ДВР ()
 ENT.ButtonMap["DVR_87"] = {
-    pos = Vector(-398,35,-28),
-    ang = Angle(0,180,5),
-    width = 1000,
-    height = 300,
+    pos = Vector(-453,37,-38),
+    ang = Angle(0,0,127.2),
+    width = 187,
+    height = 80,
     scale = 0.0625,
     hide=0.8,
 
     buttons = {
-        {ID = "DVRDisconnectToggle", x=0, y=0, w=1000, h=300, tooltip="", model = {
-            var="DVRDisconnect",sndid="disconnect_valve",--"brake_disconnect",
-            sndvol = 1, snd = function(val) return "disconnect_valve" end,
-            sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
-        },   
+        {ID = "DVRDisconnectToggle", x=0, y=0, w=187, h=80, tooltip="",var="DVRDisconnect",states={"Train.Buttons.Opened","Train.Buttons.Closed"}},   
     }
 }
 ENT.ClientSounds["DVRDisconnect"] = {{"DVR_disconnect",function() return "disconnect_valve" end,1,1,50,1e3,Angle(-90,0,0)}}
 
 ENT.ClientProps["DVR_disconnect"] = {
     model = "models/metrostroi_train/81-707/cran1.mdl",
-    pos = Vector(-451.15,43.5,-24.7),
+    pos = Vector(-451.15,43.5,-32.7),
     ang = Angle(-90,-180,-90),
     hideseat=0.2,
 }
@@ -2898,7 +2894,7 @@ for i = 0,11 do
     }
 end
 
-ENT.ButtonMap["Doors7_8_right"] = {
+ENT.ButtonMap["DoorsRight7_8"] = {
     pos = Vector(-386,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2909,11 +2905,11 @@ ENT.ButtonMap["Doors7_8_right"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "open_door4Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor4Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight7_8"] = {
     pos = Vector(-317.5,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2924,16 +2920,16 @@ ENT.ButtonMap["bldr7_8_rgh"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "door_lock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock4",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock4",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_right"] = {
+ENT.ButtonMap["DoorsRight5_6"] = {
     pos = Vector(-157,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2944,11 +2940,11 @@ ENT.ButtonMap["Doors5_6_right"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "open_door3Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor3Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight5_6"] = {
     pos = Vector(-87.5,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2959,16 +2955,16 @@ ENT.ButtonMap["bldr5_6_rgh"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "door_lock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock3",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock3",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_right"] = {
+ENT.ButtonMap["DoorsRight3_4"] = {
     pos = Vector(73,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2979,11 +2975,11 @@ ENT.ButtonMap["Doors3_4_right"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "open_door2Set",x=302,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor2Set",x=302,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight3_4"] = {
     pos = Vector(142.6,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2994,16 +2990,16 @@ ENT.ButtonMap["bldr3_4_rgh"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock2",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock2",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors1_2_right"] = {
+ENT.ButtonMap["DoorsRight1_2"] = {
     pos = Vector(300,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -3014,11 +3010,11 @@ ENT.ButtonMap["Doors1_2_right"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door1Set",x=334,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door1Set",x=15,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor1Set",x=334,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor1Set",x=15,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["Doors1_2_right_outer"] = {
+ENT.ButtonMap["DoorsOutRight1_2"] = {
     pos = Vector(332.5,-66,47),
     ang = Angle(0,0,90),
     width = 120,
@@ -3029,10 +3025,10 @@ ENT.ButtonMap["Doors1_2_right_outer"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "outer_open1Set",x=10,y=0,w= 100,h = 952,tooltip=""},
+        {ID = "OpenOutDoor1Set",x=10,y=0,w= 100,h = 952,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight1_2"] = {
     pos = Vector(372.8,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -3043,15 +3039,15 @@ ENT.ButtonMap["bldr1_2_rgh"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock1",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock1",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
-ENT.ButtonMap["Doors7_8_left"] = {
+ENT.ButtonMap["DoorsLeft7_8"] = {
     pos = Vector(-386,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -3062,11 +3058,11 @@ ENT.ButtonMap["Doors7_8_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door5Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door5Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor5Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor5Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft7_8"] = {
     pos = Vector(-317.58,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -3077,16 +3073,16 @@ ENT.ButtonMap["bldr7_8_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock5",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock5",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_left"] = {
+ENT.ButtonMap["DoorsLeft5_6"] = {
     pos = Vector(-158,62.8,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -3097,11 +3093,11 @@ ENT.ButtonMap["Doors5_6_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door6Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door6Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor6Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor6Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft5_6"] = {
     pos = Vector(-87.5,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -3112,16 +3108,16 @@ ENT.ButtonMap["bldr5_6_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock6",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock6",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_left"] = {
+ENT.ButtonMap["DoorsLeft3_4"] = {
     pos = Vector(74,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -3132,11 +3128,11 @@ ENT.ButtonMap["Doors3_4_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door7Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door7Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor7Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor7Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft3_4"] = {
     pos = Vector(142.56,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -3147,16 +3143,16 @@ ENT.ButtonMap["bldr3_4_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock7",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock7",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors1_2_left"] = {
+ENT.ButtonMap["DoorsLeft1_2"] = {
     pos = Vector(303,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -3167,11 +3163,11 @@ ENT.ButtonMap["Doors1_2_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door8Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door8Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor8Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor8Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft1_2"] = {
     pos = Vector(372.7,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -3182,9 +3178,9 @@ ENT.ButtonMap["bldr1_2_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock8",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock8",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
@@ -3202,7 +3198,7 @@ ENT.ButtonMap["DoorReleaseExtra"] = {
 
     buttons = {
         {ID = "DoorReleaseExtraToggle",x=0,y=130,w= 100,h = 30,tooltip="", model = {
-            var="DoorReleaseExtra",sndid="disconnect_valve",--"brake_disconnect",
+            var="DoorReleaseExtra",sndid="disconnect_valve",states={"Train.Buttons.Closed","Train.Buttons.Opened"},--"brake_disconnect",
             sndvol = 1, snd = function(val) return "disconnect_valve" end,
             sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
         },
@@ -3231,7 +3227,7 @@ ENT.ButtonMap["DoorReleaseRight"] = {
 
     buttons = {
         {ID = "DoorReleaseRightToggle",x=0,y=0,w= 100,h = 30,tooltip="", model = {
-            var="DoorReleaseRight",sndid="disconnect_valve",--"brake_disconnect",
+            var="DoorReleaseRight",sndid="disconnect_valve",states={"Train.Buttons.Closed","Train.Buttons.Opened"},--"brake_disconnect",
             sndvol = 1, snd = function(val) return "disconnect_valve" end,
             sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
 		},
@@ -3260,7 +3256,7 @@ ENT.ButtonMap["DoorReleaseLeft"] = {
 
     buttons = {
         {ID = "DoorReleaseLeftToggle",x=0,y=0,w= 100,h = 30,tooltip="", model = {
-            var="DoorReleaseLeft",sndid="disconnect_valve",--"brake_disconnect",
+            var="DoorReleaseLeft",sndid="disconnect_valve",states={"Train.Buttons.Closed","Train.Buttons.Opened"},--"brake_disconnect",
             sndvol = 50, snd = function(val) return "disconnect_valve" end,
             sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
 		},
@@ -3795,10 +3791,6 @@ function ENT:Think()
     self:HidePanel("EPVDisconnect",not c013)
     self:HidePanel("DriverValveDisconnect",not c013)
 
-    local DrawDVR = self:GetPackedBool("ShowDVR")
-    self:ShowHide("DVR_disconnect",DrawDVR)
-    self:HidePanel("DVR_87",not DrawDVR)
-    self:Animate("DVR_disconnect",self:GetPackedBool("DVRDisconnect") and 1 or 0,0.25,0,  4,false)
     --[[ -- Animate AV switches
     for i in ipairs(self.Panel.AVMap) do
         local value = self:GetPackedBool(64+(i-1)) and 1 or 0
@@ -4138,6 +4130,9 @@ function ENT:DrawPost()
     self:DrawOnPanel("AutostopValve",function()
         draw.DrawText("Autostop Valve", "Trebuchet24",0,6,Color(0,0,0,255))
     end)
+    self:DrawOnPanel("DVR_87",function()
+        draw.DrawText(self:GetNW2Bool("DVR") and "DVR ON" or "DVR OFF","ContentHeader",0,0,Color(60,70,70,255))
+    end)
 end
 
 function ENT:OnButtonPressed(button)
diff --git a/lua/entities/gmod_subway_81-717_lvz/init.lua b/lua/entities/gmod_subway_81-717_lvz/init.lua
index 14934ae..9309bda 100644
--- a/lua/entities/gmod_subway_81-717_lvz/init.lua
+++ b/lua/entities/gmod_subway_81-717_lvz/init.lua
@@ -17,7 +17,7 @@ ENT.SyncTable = {
     "A58","A59","A61","A15","A66",
     "RC1","VB","VRD","PB", "UAVA","UAVAC",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","DriverValveDisconnect","ParkingBrake","EPK",
-    "VUD2","VDL","VOPD","Wiper", "GV", "RC2","VAU", "door_lock1","door_lock2","door_lock3","door_lock4","door_lock5","door_lock6","door_lock7","door_lock8","DVRDisconnect","DoorReleaseLeft","DoorReleaseRight","DoorReleaseExtra",
+    "VUD2","VDL","VOPD","Wiper", "GV", "RC2","VAU", "DoorLock1","DoorLock2","DoorLock3","DoorLock4","DoorLock5","DoorLock6","DoorLock7","DoorLock8","DVRDisconnect","DoorReleaseLeft","DoorReleaseRight","DoorReleaseExtra",
     "KH","VAV","KSZD","VZP","VSOSD",
     "PAM7","PAM8","PAM9","PAMLeft","PAMRight","PAM4","PAM5","PAM6","PAMUp","PAM1","PAM2","PAM3","PAMDown","PAM0","PAMEnter","PAMEsc","PAMF","PAMM","PAMP",
 }
diff --git a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua
index 2a6d820..c358f6a 100644
--- a/lua/entities/gmod_subway_81-717_mvm/cl_init.lua
+++ b/lua/entities/gmod_subway_81-717_mvm/cl_init.lua
@@ -2053,18 +2053,19 @@ ENT.ButtonMap["AutostopValve"] = {
 }
 -- ДВР ()
 ENT.ButtonMap["DVR_87"] = {
-    pos = Vector(-398,35,-28),
-    ang = Angle(0,180,5),
-    width = 1000,
-    height = 300,
+    pos = Vector(-453,37,-38),
+    ang = Angle(0,0,127.2),
+    width = 187,
+    height = 80,
     scale = 0.0625,
     hide=0.8,
 
     buttons = {
-        {ID = "DVRDisconnectToggle", x=0, y=0, w=1000, h=300, tooltip="", model = {
-            var="DVRDisconnect",sndid="disconnect_valve",--"brake_disconnect",
-            sndvol = 1, snd = function(val) return "disconnect_valve" end,
-            sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
+        {ID = "DVRDisconnectToggle", x=0, y=0, w=187, h=80, tooltip="",var="DVRDisconnect",states={"Train.Buttons.Opened","Train.Buttons.Closed"},
+        --model = {
+        --    var="DVRDisconnect",sndid="disconnect_valve",--"brake_disconnect",
+        --    sndvol = 1, snd = function(val) return "disconnect_valve" end,
+        --    sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
         },   
     }
 }
@@ -2072,7 +2073,7 @@ ENT.ClientSounds["DVRDisconnect"] = {{"DVR_disconnect",function() return "discon
 
 ENT.ClientProps["DVR_disconnect"] = {
     model = "models/metrostroi_train/81-707/cran1.mdl",
-    pos = Vector(-451.15,43.5,-24.7),
+    pos = Vector(-451.15,43.5,-32.7),
     ang = Angle(-90,-180,-90),
     hideseat=0.2,
 }
@@ -2588,7 +2589,7 @@ for i = 0,24 do
     }
 end
 
-ENT.ButtonMap["Doors7_8_right"] = {
+ENT.ButtonMap["DoorsRight7_8"] = {
     pos = Vector(-386,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2599,11 +2600,11 @@ ENT.ButtonMap["Doors7_8_right"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "open_door4Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor4Set",x=298,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor4Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight7_8"] = {
     pos = Vector(-317.5,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2614,16 +2615,16 @@ ENT.ButtonMap["bldr7_8_rgh"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "door_lock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock4Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock4",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock4",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_right"] = {
+ENT.ButtonMap["DoorsRight5_6"] = {
     pos = Vector(-157,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2634,11 +2635,11 @@ ENT.ButtonMap["Doors5_6_right"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "open_door3Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor3Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor3Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight5_6"] = {
     pos = Vector(-87.5,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2649,16 +2650,16 @@ ENT.ButtonMap["bldr5_6_rgh"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "door_lock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock3Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock3",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock3",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_right"] = {
+ENT.ButtonMap["DoorsRight3_4"] = {
     pos = Vector(73,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2669,11 +2670,11 @@ ENT.ButtonMap["Doors3_4_right"] = {
     --hideseat=1,
 
     buttons = {
-        {ID = "open_door2Set",x=302,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor2Set",x=302,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor2Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight3_4"] = {
     pos = Vector(142.6,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2684,16 +2685,16 @@ ENT.ButtonMap["bldr3_4_rgh"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock2Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock2",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock2",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors1_2_right"] = {
+ENT.ButtonMap["DoorsRight1_2"] = {
     pos = Vector(300,-62,-50),
     ang = Angle(0,0,-90),
     width = 520,
@@ -2704,11 +2705,11 @@ ENT.ButtonMap["Doors1_2_right"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door1Set",x=334,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door1Set",x=15,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor1Set",x=334,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor1Set",x=15,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["Doors1_2_right_outer"] = {
+ENT.ButtonMap["DoorsOutRight1_2"] = {
     pos = Vector(332.5,-66,47),
     ang = Angle(0,0,90),
     width = 120,
@@ -2719,10 +2720,10 @@ ENT.ButtonMap["Doors1_2_right_outer"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "outer_open1Set",x=10,y=0,w= 100,h = 952,tooltip=""},
+        {ID = "OpenOutDoor1Set",x=10,y=0,w= 100,h = 952,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_rgh"] = {
+ENT.ButtonMap["BlockDoorsRight1_2"] = {
     pos = Vector(372.8,-64.48,-50),
     ang = Angle(0,90,-90),
     width = 20,
@@ -2733,15 +2734,15 @@ ENT.ButtonMap["bldr1_2_rgh"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock1Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock1",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock1",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
-ENT.ButtonMap["Doors7_8_left"] = {
+ENT.ButtonMap["DoorsLeft7_8"] = {
     pos = Vector(-386,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -2752,11 +2753,11 @@ ENT.ButtonMap["Doors7_8_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door5Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door5Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor5Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor5Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr7_8_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft7_8"] = {
     pos = Vector(-317.58,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -2767,16 +2768,16 @@ ENT.ButtonMap["bldr7_8_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock5Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock5",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock5",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors5_6_left"] = {
+ENT.ButtonMap["DoorsLeft5_6"] = {
     pos = Vector(-158,62.8,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -2787,11 +2788,11 @@ ENT.ButtonMap["Doors5_6_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door6Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door6Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor6Set",x=314,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor6Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr5_6_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft5_6"] = {
     pos = Vector(-87.5,64.45,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -2802,16 +2803,16 @@ ENT.ButtonMap["bldr5_6_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock6Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock6",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock6",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors3_4_left"] = {
+ENT.ButtonMap["DoorsLeft3_4"] = {
     pos = Vector(74,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -2822,11 +2823,11 @@ ENT.ButtonMap["Doors3_4_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door7Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door7Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor7Set",x=294,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor7Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr3_4_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft3_4"] = {
     pos = Vector(142.56,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -2837,16 +2838,16 @@ ENT.ButtonMap["bldr3_4_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock7Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock7",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock7",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
 }
 
 
-ENT.ButtonMap["Doors1_2_left"] = {
+ENT.ButtonMap["DoorsLeft1_2"] = {
     pos = Vector(303,62,50),
     ang = Angle(0,0,90),
     width = 520,
@@ -2857,11 +2858,11 @@ ENT.ButtonMap["Doors1_2_left"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "open_door8Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
-        {ID = "close_door8Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
+        {ID = "OpenDoor8Set",x=306,y=0,w= 100,h = 1000,tooltip=""},
+        {ID = "CloseDoor8Set",x=0,y=0,w= 60,h = 1000,tooltip=""},
     }
 }
-ENT.ButtonMap["bldr1_2_lft"] = {
+ENT.ButtonMap["BlockDoorsLeft1_2"] = {
     pos = Vector(372.7,64.5,0),
     ang = Angle(0,-90,90),
     width = 20,
@@ -2872,9 +2873,9 @@ ENT.ButtonMap["bldr1_2_lft"] = {
     --hideseat=0.005,
 
     buttons = {
-        {ID = "door_lock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
+        {ID = "DoorLock8Toggle", x=0, y=180, w=20, h=100, tooltip="", model = {
             model = "models/metrostroi_train/81-717/battery_enabler.mdl",
-            var="door_lock8",speed=0.5,vmin=1,vmax=0.8,
+            var="DoorLock8",speed=0.5,vmin=1,vmax=0.8,states={"Train.Buttons.Unlocked","Train.Buttons.Locked"},
             sndvol = 0.8, snd = function(val) return val and "pak_on" or "pak_off" end,sndmin = 80, sndmax = 1e3/3, sndang = Angle(-90,0,0),
         }},
     }
@@ -2892,7 +2893,7 @@ ENT.ButtonMap["DoorReleaseExtra"] = {
 
     buttons = {
         {ID = "DoorReleaseExtraToggle",x=0,y=130,w= 100,h = 30,tooltip="", model = {
-            var="DoorReleaseExtra",sndid="disconnect_valve",--"brake_disconnect",
+            var="DoorReleaseExtra",sndid="disconnect_valve",states={"Train.Buttons.Closed","Train.Buttons.Opened"},--"brake_disconnect",
             sndvol = 1, snd = function(val) return "disconnect_valve" end,
             sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
         },
@@ -2921,7 +2922,7 @@ ENT.ButtonMap["DoorReleaseRight"] = {
 
     buttons = {
         {ID = "DoorReleaseRightToggle",x=0,y=0,w= 100,h = 30,tooltip="", model = {
-            var="DoorReleaseRight",sndid="disconnect_valve",--"brake_disconnect",
+            var="DoorReleaseRight",sndid="disconnect_valve",states={"Train.Buttons.Closed","Train.Buttons.Opened"},--"brake_disconnect",
             sndvol = 1, snd = function(val) return "disconnect_valve" end,
             sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
 		},
@@ -2950,7 +2951,7 @@ ENT.ButtonMap["DoorReleaseLeft"] = {
 
     buttons = {
         {ID = "DoorReleaseLeftToggle",x=0,y=0,w= 100,h = 30,tooltip="", model = {
-            var="DoorReleaseLeft",sndid="disconnect_valve",--"brake_disconnect",
+            var="DoorReleaseLeft",sndid="disconnect_valve",states={"Train.Buttons.Closed","Train.Buttons.Opened"},--"brake_disconnect",
             sndvol = 50, snd = function(val) return "disconnect_valve" end,
             sndmin = 90, sndmax = 1e3, sndang = Angle(-90,0,0),}
 		},
@@ -3223,10 +3224,10 @@ function ENT:Think()
     self:HidePanel("DriverValveBLDisconnect",self:GetPackedBool("Crane013"))
     self:HidePanel("DriverValveTLDisconnect",self:GetPackedBool("Crane013"))
 
-    local DrawDVR = self:GetPackedBool("ShowDVR")
-    self:ShowHide("DVR_disconnect",DrawDVR)
-    self:HidePanel("DVR_87",not DrawDVR)
-    self:Animate("DVR_disconnect",self:GetPackedBool("DVRDisconnect") and 1 or 0,0.25,0,  4,false)
+    --local DrawDVR = self:GetPackedBool("ShowDVR")
+    --self:ShowHide("DVR_disconnect",DrawDVR)
+    --self:HidePanel("DVR_87",not DrawDVR)
+    --self:Animate("DVR_disconnect",self:GetPackedBool("DVRDisconnect") and 1 or 0,0.25,0,  4,false)
 
     self:Animate("brake334",self:GetPackedRatio("CranePosition")/5,0.35,0.65,256,24)
     self:Animate("brake013",        Cpos[self:GetPackedRatio("CranePosition")] or 0, 0.03, 0.458,  256,24)
@@ -3806,6 +3807,9 @@ function ENT:DrawPost()
     self:DrawOnPanel("AutostopValve",function()
         draw.DrawText("Autostop Valve", "Trebuchet24",0,6,Color(0,0,0,255))
     end)
+    self:DrawOnPanel("DVR_87",function()
+        draw.DrawText(self:GetNW2Bool("DVR") and "DVR ON" or "DVR OFF","ContentHeader",0,0,Color(60,70,70,255))
+    end)
 end
 
 function ENT:OnButtonPressed(button)
diff --git a/lua/entities/gmod_subway_81-717_mvm/init.lua b/lua/entities/gmod_subway_81-717_mvm/init.lua
index e2a1bb8..edbeb94 100644
--- a/lua/entities/gmod_subway_81-717_mvm/init.lua
+++ b/lua/entities/gmod_subway_81-717_mvm/init.lua
@@ -18,9 +18,9 @@ ENT.SyncTable = {
     "AIS","A15","A81","A68","A80",
     "RC1","VB","BPS","UOS", "PB", "UAVA","UAVAC",
     "DriverValveBLDisconnect","DriverValveTLDisconnect","DriverValveDisconnect","ParkingBrake","EPK","EmergencyBrakeValve",
-    "VUD2","VDL","Wiper", "GV", "door_lock1","door_lock2","door_lock3","door_lock4","door_lock5","door_lock6","door_lock7","door_lock8","DVRDisconnect","DoorReleaseLeft","DoorReleaseRight","DoorReleaseExtra",
+    "VUD2","VDL","Wiper","GV","DoorLock1","DoorLock2","DoorLock3","DoorLock4","DoorLock5","DoorLock6","DoorLock7","DoorLock8","DVRDisconnect","DoorReleaseLeft","DoorReleaseRight","DoorReleaseExtra",
     "R_ASNPMenu","R_ASNPUp","R_ASNPDown","R_ASNPOn"
-    , "ALSFreq","Ring","VBD",
+    ,"ALSFreq","Ring","VBD",
     "V11","V12","V13","UPPS_On","SAB1"
 }
 ENT.SyncFunctions = {
@@ -601,7 +601,7 @@ function ENT:Think()
     self:SetPackedBool("RedLights",Panel.RedLight2 > 0)
     self:SetPackedBool("CabLights",Panel.CabLights>0)
     self:SetPackedBool("EqLights",Panel.EqLights>0)
-    self:SetPackedBool("ShowDVR",self.OtsekDoor1)
+    --self:SetPackedBool("ShowDVR",self.OtsekDoor1)
 
     self:SetPackedBool("PanelLights",Panel.PanelLights > 0.5)
 
diff --git a/lua/metrostroi/systems/sys_81_717_pneumatic.lua b/lua/metrostroi/systems/sys_81_717_pneumatic.lua
index cec4e9b..8f20817 100644
--- a/lua/metrostroi/systems/sys_81_717_pneumatic.lua
+++ b/lua/metrostroi/systems/sys_81_717_pneumatic.lua
@@ -70,8 +70,6 @@ function TRAIN_SYSTEM:Initialize(parameters)
     --end
 
     self.NewPneumatics = parameters and parameters.pneumatics or 0
-    --self:TriggerInput("NewPneumatics",self.NewPneumatics)
-    --self:TriggerInput("HeadCarPneumatic",parameters and parameters.headcar == true and 1 or 0)
     
     --DKPT
     self.Train:LoadSystem("DKPT","Relay","R-52B") --
@@ -115,32 +113,32 @@ function TRAIN_SYSTEM:Initialize(parameters)
 	    self.Train:LoadSystem("DoorReleaseLeft","Relay","Switch")
 	    self.Train:LoadSystem("DVRDisconnect","Relay","Switch", { normally_closed = false, bass = true})
 	    --Механическая блокировка дверей
-        self.Train:LoadSystem("door_lock1","Relay","VB-11", {bass = true})	--1 правый
-        self.Train:LoadSystem("door_lock2","Relay","VB-11", {bass = true})	--2 правый
-        self.Train:LoadSystem("door_lock3","Relay","VB-11", {bass = true})	--3 правый
-        self.Train:LoadSystem("door_lock4","Relay","VB-11", {bass = true})	--4 правый
-        self.Train:LoadSystem("door_lock5","Relay","VB-11", {bass = true})	--4 левый
-        self.Train:LoadSystem("door_lock6","Relay","VB-11", {bass = true})	--3 левый
-        self.Train:LoadSystem("door_lock7","Relay","VB-11", {bass = true})	--2 левый
-        self.Train:LoadSystem("door_lock8","Relay","VB-11", {bass = true})	--1 левый
+        self.Train:LoadSystem("DoorLock1","Relay","Switch", {bass = true})	--1 правый
+        self.Train:LoadSystem("DoorLock2","Relay","Switch", {bass = true})	--2 правый
+        self.Train:LoadSystem("DoorLock3","Relay","Switch", {bass = true})	--3 правый
+        self.Train:LoadSystem("DoorLock4","Relay","Switch", {bass = true})	--4 правый
+        self.Train:LoadSystem("DoorLock5","Relay","Switch", {bass = true})	--4 левый
+        self.Train:LoadSystem("DoorLock6","Relay","Switch", {bass = true})	--3 левый
+        self.Train:LoadSystem("DoorLock7","Relay","Switch", {bass = true})	--2 левый
+        self.Train:LoadSystem("DoorLock8","Relay","Switch", {bass = true})	--1 левый
 	    --раздвинуть/сдвинуть створки руками
-	    self.Train:LoadSystem("outer_open1","Relay","Switch")				--передние правые двери головного вагона (открытие снаружи состава)
-	    self.Train:LoadSystem("open_door1","Relay","Switch")
-	    self.Train:LoadSystem("open_door2","Relay","Switch")
-	    self.Train:LoadSystem("open_door3","Relay","Switch")
-	    self.Train:LoadSystem("open_door4","Relay","Switch")
-	    self.Train:LoadSystem("open_door5","Relay","Switch")
-	    self.Train:LoadSystem("open_door6","Relay","Switch")
-	    self.Train:LoadSystem("open_door7","Relay","Switch")
-	    self.Train:LoadSystem("open_door8","Relay","Switch")
-	    self.Train:LoadSystem("close_door1","Relay","Switch")
-	    self.Train:LoadSystem("close_door2","Relay","Switch")
-	    self.Train:LoadSystem("close_door3","Relay","Switch")
-	    self.Train:LoadSystem("close_door4","Relay","Switch")
-	    self.Train:LoadSystem("close_door5","Relay","Switch")
-	    self.Train:LoadSystem("close_door6","Relay","Switch")
-	    self.Train:LoadSystem("close_door7","Relay","Switch")
-	    self.Train:LoadSystem("close_door8","Relay","Switch")
+	    self.Train:LoadSystem("OpenOutDoor1","Relay","Switch")				--передние правые двери головного вагона (открытие снаружи состава)
+	    self.Train:LoadSystem("OpenDoor1","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor2","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor3","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor4","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor5","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor6","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor7","Relay","Switch")
+	    self.Train:LoadSystem("OpenDoor8","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor1","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor2","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor3","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor4","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor5","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor6","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor7","Relay","Switch")
+	    self.Train:LoadSystem("CloseDoor8","Relay","Switch")
     --end
 
     --if self.Train.SubwayTrain.WagType == 1 then
@@ -184,13 +182,10 @@ function TRAIN_SYSTEM:Initialize(parameters)
     if not TURBOSTROI then
         local start
         if self.NewPneumatics == 1 then
-            self.LeftDoorState = self.LeftDoorState --or { 0,0,0,0 }
-            self.RightDoorState = self.RightDoorState --or { 0,0,0,0 }
-            --self.LeftDoorDir = { 0,0,0,0 }
-            --self.RightDoorDir = { 0,0,0,0 }
+            self.LeftDoorState = self.LeftDoorState
+            self.RightDoorState = self.RightDoorState
             self.LeftDoorSpeed = {1,1,1,1}
             self.RightDoorSpeed = {1,1,1,1}
-		    --self.DSprev = {{0,0},{0,0},{0,0},{0,0}}
             self.LeftDoorStuck = {false, false, false, false}
             self.RightDoorStuck = {false, false, false, false}
 
@@ -416,7 +411,7 @@ function TRAIN_SYSTEM:Think(dT)
         Train.Panel.UAVACOpened = (1-Train.UAVAC.Value)*((CurTime()-CurTime()%0.5)%1)
     end
 
-    if (Train:GetClass():match("81%-71[74]_mvm") or Train:GetClass():match("81%-71[74]_lvz")) and not Train.CarCount then
+    if not Train.CarCount and (Train:GetClass():match("81%-71[74]_mvm") or Train:GetClass():match("81%-71[74]_lvz")) then
         if Train.IgnoreEngine == false then
             self:TriggerInput("NewPneumatics",1)
             Train.CarCount = #Train.WagonList
@@ -480,7 +475,7 @@ function TRAIN_SYSTEM:Think(dT)
     if self.ValveType == 1 then
         self.BLDisconnect = Train.DriverValveBLDisconnect.Value > 0
         self.TLDisconnect = Train.DriverValveTLDisconnect.Value > 0 and self.RealDriverValvePosition ~= 3
-        pr_speed = 1*6--wagc--*((self.BrakeLinePressure-self.ReservoirPressure)/0.6)
+        pr_speed = 6
         if self.TLDisconnect then self.TLDisconnectPressure = self.TrainLinePressure end
         if self.BLDisconnect then self.BLDisconnectPressure = self.BrakeLinePressure end
         if self.Leak or self.BrakeLineOpen then pr_speed = pr_speed*0.3 end
@@ -531,13 +526,13 @@ function TRAIN_SYSTEM:Think(dT)
         local res_dischrg_rate5 = self.BLDisconnect and 1.12 or 8
         -- 334: 4 Reservoir open to atmosphere, brake line equalizes with reservoir
         if (self.RealDriverValvePosition == 4) then
-            self:equalizePressure(dT,"ReservoirPressure", 0.0, res_dischrg_rate4, nil,nil,1)--0.35)-0.55
+            self:equalizePressure(dT,"ReservoirPressure", 0.0, res_dischrg_rate4, nil,nil,1)
         end
 
         -- 334: 5 Reservoir and brake line open to atmosphere
         if (self.RealDriverValvePosition == 5) then
-            self:equalizePressure(dT,"ReservoirPressure", 0.0, res_dischrg_rate5)--,nil,nil,2)--1.70
-            local pr_speed = 1.25*6--wagc
+            self:equalizePressure(dT,"ReservoirPressure", 0.0, res_dischrg_rate5)
+            local pr_speed = 1.25*6
             if self.Leak or self.BrakeLineOpen then pr_speed = pr_speed*0.3 end
             if self.BLDisconnect then
                 if self.Leak then pr_speed = pr_speed*6.2 end
@@ -655,7 +650,7 @@ function TRAIN_SYSTEM:Think(dT)
     end
     self.Leak = false
     if wagc ~= Train.OldWagIsoCount or not Train.pr_spd_init then
-        pr_speed = (0.4*math.exp(0.1*wagc-1)+1)*160/(2*wagc+20) --2
+        pr_speed = (0.4*math.exp(0.1*wagc-1)+1)*160/(2*wagc+20)
         Train.OldWagIsoCount = wagc
         Train.pr_spd_init = true
     end
@@ -713,7 +708,7 @@ function TRAIN_SYSTEM:Think(dT)
     local leak = 0
     if Train.EmergencyBrakeValve and Train.EmergencyBrakeValve.Value > 0.5 then
 	    local leakst = math.max(0.5,math.exp(0.5*self.BrakeLinePressure))
-        leak = self:equalizePressure(dT,"BrakeLinePressure", 0.0,leakst)--,false,false,10) --was leakst*wagc/5
+        leak = self:equalizePressure(dT,"BrakeLinePressure", 0.0,leakst)
         self.Leak = true
     end
     Train:SetPackedRatio("EmergencyBrakeValve_dPdT", -leak/wagc)
@@ -733,7 +728,7 @@ function TRAIN_SYSTEM:Think(dT)
     self.GN2Offset = self.GN2Offset or math.random(20,100)*0.002 + (self.GN2Start or 2.5)
     self.GN1Offset = self.GN1Offset or math.random(20,100)*0.002 + (self.GN1Start or 0.9)
     local bcrel_thold = self.GN2Offset + self.WeightLoadRatio*(self.GN2Offset - 1.4)
-    self.BcBl = bcrel_thold/1.82--1.92
+    self.BcBl = bcrel_thold/1.82
     if Train.AirDistributorDisconnect.Value == 0 and aird_ready then
         -- Valve #1
         if (Train.PneumaticNo1.Value == 1.0) and (Train.PneumaticNo2.Value == 0.0) then
@@ -838,7 +833,7 @@ function TRAIN_SYSTEM:Think(dT)
 	    local LeftRelease = Train.DoorReleaseLeft.Value == 0
 	    local RightRelease = Train.DoorReleaseRight.Value == 0
 	    _1stRightRelease = Train.DoorReleaseExtra and Train.DoorReleaseExtra.Value == 0
-        if self.DoorLinePressure >= 1.4 then	--was > 2.6
+        if self.DoorLinePressure >= 1.4 then
             -- Simulate DVR engage lag
             if Train.VDOL.Value == 1.0 and not Train.VDOLEnergized then
                 Train.VDOLEnergized = true
@@ -969,13 +964,13 @@ function TRAIN_SYSTEM:Think(dT)
 	    local rmClose = false							--|
 	    local lmOpen = false							--|
         local lmClose = false							--|manual opening-closing
-	    local v = "door_lock"
-	    local m = "open_door"
-	    local n = "close_door"
+	    local v = "DoorLock"
+	    local m = "OpenDoor"
+	    local n = "CloseDoor"
         for i=1,4 do
 	    	rlocked = Train[v..i].Value > 0
 	    	llocked = Train[v..tostring(9-i)].Value > 0
-	    	rmOpen = Train[m..i].Value > 0 or Train["outer_open"..i] and Train["outer_open"..i].Value > 0
+	    	rmOpen = Train[m..i].Value > 0 or Train["OpenOutDoor"..i] and Train["OpenOutDoor"..i].Value > 0
 	    	lmOpen = Train[m..tostring(9-i)].Value > 0
 	    	rmClose = Train[n..i].Value > 0
 	    	lmClose = Train[n..tostring(9-i)].Value > 0
@@ -1084,8 +1079,8 @@ function TRAIN_SYSTEM:Think(dT)
     ----------------------------------------------------------------------------
     -- Simulate compressor operation and train line depletion
     self.Compressor = Train.KK.Value * (Train.Electric.Aux750V > 550 and 1 or 0)
-    self.TrainLinePressure = self.TrainLinePressure - (Train.AirConsumeRatio or 1)*trainLineConsumption_dPdT*dT -- 0.190 --0.170 --0.07
-    if self.Compressor == 1 then self:equalizePressure(dT,"TrainLinePressure", 10.0, Train.CompressorEfficiency or 0.04) end -- 0.04
+    self.TrainLinePressure = self.TrainLinePressure - (Train.AirConsumeRatio or 1)*trainLineConsumption_dPdT*dT
+    if self.Compressor == 1 then self:equalizePressure(dT,"TrainLinePressure", 10.0, Train.CompressorEfficiency or 0.04) end
     self:equalizePressure(dT,"TrainLinePressure", 0,Train.AirLeakRatio or 0.003)
     -- Overpressure
     if self.TrainLinePressure > math.max(7.2, (9.2 - self.TrainLineOverpressureValve*0.2)) and self.TrainLineOverpressureValve%2 == 0 then self.TrainLineOverpressureValve = self.TrainLineOverpressureValve + 1 end
@@ -1098,17 +1093,17 @@ function TRAIN_SYSTEM:Think(dT)
 
     ----------------------------------------------------------------------------
     -- Pressure triggered relays
-    Train.AVT:TriggerInput("Open", self.BrakeCylinderPressure > 1.9) -- 1.8 - 2.0
-    Train.AVT:TriggerInput("Close",self.BrakeCylinderPressure < 0.9) -- 0.9 - 1.5
+    Train.AVT:TriggerInput("Open", self.BrakeCylinderPressure > 1.9)
+    Train.AVT:TriggerInput("Close",self.BrakeCylinderPressure < 0.9)
     Train.AK:TriggerInput( "Open", self.TrainLinePressure > 8.2)
     Train.AK:TriggerInput( "Close",self.TrainLinePressure < 6.3)
     Train.BPT:TriggerInput("Set",  (IsValid(Train.FrontBogey) and Train.FrontBogey.BrakeCylinderPressure+(not Train.FrontBogey.DisableParking and Train.FrontBogey.ParkingBrakePressure or 0) or self.BrakeCylinderPressure)>0.3)
-    Train.DKPT:TriggerInput("Set", self.BrakeCylinderPressure > 0.3) -- 1.8 - 2.0
-    if self.HeadCarPneumatic == 1 or not self.NewPneumatics then
-        Train.AVU:TriggerInput("Open", self.BrakeLinePressure < 2.7) -- 2.7 - 2.9
-        Train.AVU:TriggerInput("Close",self.BrakeLinePressure > 3.5) -- 3.5 - 3.7
-        Train.SOT:TriggerInput("Open", self.EPKPressure < 1.3) -- 2.7 - 2.9
-        Train.SOT:TriggerInput("Close", self.EPKPressure > 1.5) -- 2.7 - 2.9
+    Train.DKPT:TriggerInput("Set", self.BrakeCylinderPressure > 0.3)
+    if self.HeadCarPneumatic and self.HeadCarPneumatic == 1 or not self.NewPneumatics then
+        Train.AVU:TriggerInput("Open", self.BrakeLinePressure < 2.7)
+        Train.AVU:TriggerInput("Close",self.BrakeLinePressure > 3.5)
+        Train.SOT:TriggerInput("Open", self.EPKPressure < 1.3)
+        Train.SOT:TriggerInput("Close", self.EPKPressure > 1.5)
         Train.SQ3:TriggerInput("Set",  Train.PassengerDoor and 0 or 1)
         ----------------------------------------------------------------------------
         if self.DriverValveDisconnectPrevious ~= Train.DriverValveDisconnect.Value then
@@ -1129,7 +1124,7 @@ function TRAIN_SYSTEM:Think(dT)
         if self.DVDOffTimer then
             if self.BrakeLinePressure - (km013_setpoint[self.RealDriverValvePosition]-0.7) > 0.02 and CurTime()-self.DVDOffTimer < wagc*5/8 then
                 --print "Снижение давления в ТМ..."
-                local pr_speed = 22--1.4*wagc --2
+                local pr_speed = 22
                 self:equalizePressure(dT,"BrakeLinePressure", math.max(0,km013_setpoint[self.RealDriverValvePosition]-0.7), pr_speed)
             else
                 --print("Снижение давления в ТМ завершено за "..(CurTime()-self.DVDOffTimer).." секунд")
@@ -1144,6 +1139,7 @@ function TRAIN_SYSTEM:Think(dT)
     Train:SetNW2Bool("FtI",Train.FrontTrainLineIsolation.Value ~= 0)
     Train:SetNW2Bool("RtI",Train.RearTrainLineIsolation.Value ~= 0)
     Train:SetNW2Bool("AD",Train.AirDistributorDisconnect.Value == 0)
+    Train:SetNW2Bool("DVR",Train.DVRDisconnect.Value == 0)
     if self.NewPneumatics == 1 then
 	    Train:SetNW2Bool("DoorReleaseRight",Train.DoorReleaseRight.Value ~= 0)
 	    Train:SetNW2Bool("DoorReleaseLeft",Train.DoorReleaseLeft.Value ~= 0)
diff --git a/lua/metrostroi_data/languages/en_717.lua b/lua/metrostroi_data/languages/en_717.lua
index 873e042..12ac6ba 100644
--- a/lua/metrostroi_data/languages/en_717.lua
+++ b/lua/metrostroi_data/languages/en_717.lua
@@ -579,35 +579,35 @@ Entities.gmod_subway_81-717_mvm.Buttons.ParkingBrake.ParkingBrakeToggle
 Entities.gmod_subway_81-717_mvm.Buttons.AutostopValve.AutostopValveSet                          = @[Common.717.AUTOSTOP]
 
 #Doors manual controls
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_right.open_door4Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_right.open_door3Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_right.open_door2Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_right.open_door1Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_right.close_door4Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_right.close_door3Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_right.close_door2Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_right.close_door1Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_left.open_door5Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_left.open_door6Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_left.open_door7Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_left.open_door8Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_left.close_door5Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_left.close_door6Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_left.close_door7Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_left.close_door8Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_right_outer.outer_open1Set                           = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr7_8_rgh.door_lock4Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr5_6_rgh.door_lock3Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr3_4_rgh.door_lock2Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr1_2_rgh.door_lock1Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr7_8_lft.door_lock5Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr5_6_lft.door_lock6Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr3_4_lft.door_lock7Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr1_2_lft.door_lock8Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseExtra.DoorReleaseExtraToggle                 = @[Common.717.DoorReleaseExt]      
-Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]     
-Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]    
-Entities.gmod_subway_81-717_mvm.Buttons.DVR_87.DVRDisconnectToggle                              = @[Common.717.DVR87]                   
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight7_8.OpenDoor4Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight5_6.OpenDoor3Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight3_4.OpenDoor2Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight1_2.OpenDoor1Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight7_8.CloseDoor4Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight5_6.CloseDoor3Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight3_4.CloseDoor2Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight1_2.CloseDoor1Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft7_8.OpenDoor5Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft5_6.OpenDoor6Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft3_4.OpenDoor7Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft1_2.OpenDoor8Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft7_8.CloseDoor5Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft5_6.CloseDoor6Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft3_4.CloseDoor7Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft1_2.CloseDoor8Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                            = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight7_8.DoorLock4Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight5_6.DoorLock3Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight3_4.DoorLock2Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight1_2.DoorLock1Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft7_8.DoorLock5Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft5_6.DoorLock6Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft3_4.DoorLock7Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft1_2.DoorLock8Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseExtra.DoorReleaseExtraToggle                     = @[Common.717.DoorReleaseExt]      
+Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                       = @[Common.717.DoorReleaseLeft]     
+Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseRight.DoorReleaseRightToggle                     = @[Common.717.DoorReleaseRight]    
+Entities.gmod_subway_81-717_mvm.Buttons.DVR_87.DVRDisconnectToggle                                  = @[Common.717.DVR87]                   
 
 
 #gmod_subway_81-717_lvz
@@ -1031,31 +1031,31 @@ Entities.gmod_subway_81-717_lvz.Buttons.ParkingBrake.ParkingBrakeToggle
 Entities.gmod_subway_81-717_lvz.Buttons.AutostopValve.AutostopValveSet                          = @[Common.717.AUTOSTOP]
 
 #Doors manual controls
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_right.open_door4Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_right.open_door3Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_right.open_door2Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_right.open_door1Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_left.open_door5Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_left.open_door6Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_left.open_door7Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_left.open_door8Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_right.close_door4Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_right.close_door3Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_right.close_door2Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_right.close_door1Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_left.close_door5Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_left.close_door6Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_left.close_door7Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_left.close_door8Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_right_outer.outer_open1Set                           = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr7_8_rgh.door_lock4Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr5_6_rgh.door_lock3Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr3_4_rgh.door_lock2Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr1_2_rgh.door_lock1Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr7_8_lft.door_lock5Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr5_6_lft.door_lock6Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr3_4_lft.door_lock7Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr1_2_lft.door_lock8Toggle                                 = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight7_8.OpenDoor4Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight5_6.OpenDoor3Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight3_4.OpenDoor2Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight1_2.OpenDoor1Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft7_8.OpenDoor5Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft5_6.OpenDoor6Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft3_4.OpenDoor7Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft1_2.OpenDoor8Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight7_8.CloseDoor4Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight5_6.CloseDoor3Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight3_4.CloseDoor2Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight1_2.CloseDoor1Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft7_8.CloseDoor5Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft5_6.CloseDoor6Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft3_4.CloseDoor7Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft1_2.CloseDoor8Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                            = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight7_8.DoorLock4Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight5_6.DoorLock3Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight3_4.DoorLock2Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight1_2.DoorLock1Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft7_8.DoorLock5Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft5_6.DoorLock6Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft3_4.DoorLock7Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft1_2.DoorLock8Toggle                           = @[Common.717.HDLK]
 Entities.gmod_subway_81-717_lvz.Buttons.DoorReleaseExtra.DoorReleaseExtraToggle                 = @[Common.717.DoorReleaseExt]
 Entities.gmod_subway_81-717_lvz.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]
 Entities.gmod_subway_81-717_lvz.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]
@@ -1146,31 +1146,31 @@ Entities.gmod_subway_81-714_mvm.Buttons.Pressures.!BCPressure           = @[Comm
 Entities.gmod_subway_81-714_mvm.Buttons.Pressures.!BLTLPressure         = @[Common.ALL.BLTLPressure]
 
 #Doors manual controls
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_right.open_door8Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_right.open_door7Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_right.open_door6Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_right.open_door5Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_right.close_door8Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_right.close_door7Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_right.close_door6Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_right.close_door5Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_left.open_door1Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_left.open_door2Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_left.open_door3Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_left.open_door4Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_left.close_door1Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_left.close_door2Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_left.close_door3Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_left.close_door4Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_right_outer.outer_open1Set                            = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr7_8_rgh.door_lock8Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr5_6_rgh.door_lock7Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr3_4_rgh.door_lock6Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr1_2_rgh.door_lock5Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr7_8_lft.door_lock1Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr5_6_lft.door_lock2Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr3_4_lft.door_lock3Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr1_2_lft.door_lock4Toggle                                 = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight7_8.OpenDoor8Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight5_6.OpenDoor7Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight3_4.OpenDoor6Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight1_2.OpenDoor5Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight7_8.CloseDoor8Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight5_6.CloseDoor7Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight3_4.CloseDoor6Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight1_2.CloseDoor5Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft7_8.OpenDoor1Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft5_6.OpenDoor2Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft3_4.OpenDoor3Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft1_2.OpenDoor4Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft7_8.CloseDoor1Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft5_6.CloseDoor2Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft3_4.CloseDoor3Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft1_2.CloseDoor4Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                             = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight7_8.DoorLock8Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight5_6.DoorLock7Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight3_4.DoorLock6Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight1_2.DoorLock5Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft7_8.DoorLock1Toggle                            = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft5_6.DoorLock2Toggle                            = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft3_4.DoorLock3Toggle                            = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft1_2.DoorLock4Toggle                            = @[Common.717.HDLK]
 Entities.gmod_subway_81-714_mvm.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]
 Entities.gmod_subway_81-714_mvm.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]
 Entities.gmod_subway_81-714_mvm.Buttons.DVR_87.DVRDisconnectToggle                              = @[Common.717.DVR87]
@@ -1255,31 +1255,31 @@ Entities.gmod_subway_81-714_lvz.Buttons.Pressures.!BCPressure           = @[Comm
 Entities.gmod_subway_81-714_lvz.Buttons.Pressures.!BLTLPressure         = @[Common.ALL.BLTLPressure]
 
 #Doors manual controls
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_right.open_door8Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_right.open_door7Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_right.open_door6Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_right.open_door5Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_right.close_door8Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_right.close_door7Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_right.close_door6Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_right.close_door5Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_left.open_door1Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_left.open_door2Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_left.open_door3Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_left.open_door4Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_left.close_door1Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_left.close_door2Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_left.close_door3Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_left.close_door4Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_right_outer.outer_open1Set                           = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr7_8_rgh.door_lock8Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr5_6_rgh.door_lock7Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr3_4_rgh.door_lock6Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr1_2_rgh.door_lock5Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr7_8_lft.door_lock1Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr5_6_lft.door_lock2Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr3_4_lft.door_lock3Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr1_2_lft.door_lock4Toggle                                 = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight7_8.OpenDoor8Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight5_6.OpenDoor7Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight3_4.OpenDoor6Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight1_2.OpenDoor5Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight7_8.CloseDoor8Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight5_6.CloseDoor7Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight3_4.CloseDoor6Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight1_2.CloseDoor5Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft7_8.OpenDoor1Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft5_6.OpenDoor2Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft3_4.OpenDoor3Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft1_2.OpenDoor4Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft7_8.CloseDoor1Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft5_6.CloseDoor2Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft3_4.CloseDoor3Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft1_2.CloseDoor4Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                            = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight7_8.DoorLock8Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight5_6.DoorLock7Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight3_4.DoorLock6Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight1_2.DoorLock5Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft7_8.DoorLock1Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft5_6.DoorLock2Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft3_4.DoorLock3Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft1_2.DoorLock4Toggle                           = @[Common.717.HDLK]
 Entities.gmod_subway_81-714_lvz.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]
 Entities.gmod_subway_81-714_lvz.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]
 Entities.gmod_subway_81-714_lvz.Buttons.DVR_87.DVRDisconnectToggle                              = @[Common.717.DVR87]
diff --git a/lua/metrostroi_data/languages/ru_717.lua b/lua/metrostroi_data/languages/ru_717.lua
index 1f71f98..694cd3e 100644
--- a/lua/metrostroi_data/languages/ru_717.lua
+++ b/lua/metrostroi_data/languages/ru_717.lua
@@ -208,10 +208,10 @@ Common.717.AUTOSTOP             = Сорвать срывной клапан
 
 Common.717.HOD                  = Раздвинуть двери
 Common.717.HCD                  = Закрыть двери
-Common.717.HDLK                 = Блокировка дверей
-Common.717.DoorReleaseExt       = Выключение первой правой двери
-Common.717.DoorReleaseLeft      = Выключение дверей левых
-Common.717.DoorReleaseRight     = Выключение дверей правых
+Common.717.HDLK                 = Замок блокировки дверей
+Common.717.DoorReleaseExt       = Кран выключения первой правой двери
+Common.717.DoorReleaseLeft      = Кран выключения левых дверей
+Common.717.DoorReleaseRight     = Кран выключения правых дверей
 Common.717.DVR87                = Разобщительный кран ДВР
 
 
@@ -580,31 +580,31 @@ Entities.gmod_subway_81-717_mvm.Buttons.ParkingBrake.ParkingBrakeToggle
 Entities.gmod_subway_81-717_mvm.Buttons.AutostopValve.AutostopValveSet                          = @[Common.717.AUTOSTOP]
 
 #Doors manual controls
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_right.open_door4Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_right.open_door3Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_right.open_door2Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_right.open_door1Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_right.close_door4Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_right.close_door3Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_right.close_door2Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_right.close_door1Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_left.open_door5Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_left.open_door6Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_left.open_door7Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_left.open_door8Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors7_8_left.close_door5Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors5_6_left.close_door6Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors3_4_left.close_door7Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_left.close_door8Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_mvm.Buttons.Doors1_2_right_outer.outer_open1Set                           = @[Common.717.HOD]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr7_8_rgh.door_lock4Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr5_6_rgh.door_lock3Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr3_4_rgh.door_lock2Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr1_2_rgh.door_lock1Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr7_8_lft.door_lock5Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr5_6_lft.door_lock6Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr3_4_lft.door_lock7Toggle                                  = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_mvm.Buttons.bldr1_2_lft.door_lock8Toggle                                  = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight7_8.OpenDoor4Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight5_6.OpenDoor3Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight3_4.OpenDoor2Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight1_2.OpenDoor1Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight7_8.CloseDoor4Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight5_6.CloseDoor3Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight3_4.CloseDoor2Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsRight1_2.CloseDoor1Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft7_8.OpenDoor5Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft5_6.OpenDoor6Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft3_4.OpenDoor7Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft1_2.OpenDoor8Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft7_8.CloseDoor5Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft5_6.CloseDoor6Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft3_4.CloseDoor7Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsLeft1_2.CloseDoor8Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_mvm.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                            = @[Common.717.HOD]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight7_8.DoorLock4Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight5_6.DoorLock3Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight3_4.DoorLock2Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsRight1_2.DoorLock1Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft7_8.DoorLock5Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft5_6.DoorLock6Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft3_4.DoorLock7Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_mvm.Buttons.BlockDoorsLeft1_2.DoorLock8Toggle                           = @[Common.717.HDLK]
 Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseExtra.DoorReleaseExtraToggle                 = @[Common.717.DoorReleaseExt]      
 Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]     
 Entities.gmod_subway_81-717_mvm.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]    
@@ -1031,31 +1031,31 @@ Entities.gmod_subway_81-717_lvz.Buttons.ParkingBrake.ParkingBrakeToggle
 Entities.gmod_subway_81-717_lvz.Buttons.AutostopValve.AutostopValveSet                          = @[Common.717.AUTOSTOP]
 
 #Doors manual controls
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_right.open_door4Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_right.open_door3Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_right.open_door2Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_right.open_door1Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_left.open_door5Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_left.open_door6Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_left.open_door7Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_left.open_door8Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_right.close_door4Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_right.close_door3Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_right.close_door2Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_right.close_door1Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors7_8_left.close_door5Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors5_6_left.close_door6Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors3_4_left.close_door7Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_left.close_door8Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-717_lvz.Buttons.Doors1_2_right_outer.outer_open1Set                           = @[Common.717.HOD]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr7_8_rgh.door_lock4Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr5_6_rgh.door_lock3Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr3_4_rgh.door_lock2Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr1_2_rgh.door_lock1Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr7_8_lft.door_lock5Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr5_6_lft.door_lock6Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr3_4_lft.door_lock7Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-717_lvz.Buttons.bldr1_2_lft.door_lock8Toggle                                 = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight7_8.OpenDoor4Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight5_6.OpenDoor3Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight3_4.OpenDoor2Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight1_2.OpenDoor1Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft7_8.OpenDoor5Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft5_6.OpenDoor6Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft3_4.OpenDoor7Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft1_2.OpenDoor8Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight7_8.CloseDoor4Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight5_6.CloseDoor3Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight3_4.CloseDoor2Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsRight1_2.CloseDoor1Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft7_8.CloseDoor5Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft5_6.CloseDoor6Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft3_4.CloseDoor7Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsLeft1_2.CloseDoor8Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-717_lvz.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                            = @[Common.717.HOD]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight7_8.DoorLock4Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight5_6.DoorLock3Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight3_4.DoorLock2Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsRight1_2.DoorLock1Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft7_8.DoorLock5Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft5_6.DoorLock6Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft3_4.DoorLock7Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-717_lvz.Buttons.BlockDoorsLeft1_2.DoorLock8Toggle                           = @[Common.717.HDLK]
 Entities.gmod_subway_81-717_lvz.Buttons.DoorReleaseExtra.DoorReleaseExtraToggle                 = @[Common.717.DoorReleaseExt]
 Entities.gmod_subway_81-717_lvz.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]
 Entities.gmod_subway_81-717_lvz.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]
@@ -1146,31 +1146,31 @@ Entities.gmod_subway_81-714_mvm.Buttons.Pressures.!BCPressure = @[Common.ALL.BCP
 Entities.gmod_subway_81-714_mvm.Buttons.Pressures.!BLTLPressure = @[Common.ALL.BLTLPressure]
 
 #Doors manual controls
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_right.open_door8Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_right.open_door7Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_right.open_door6Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_right.open_door5Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_right.close_door8Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_right.close_door7Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_right.close_door6Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_right.close_door5Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_left.open_door1Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_left.open_door2Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_left.open_door3Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_left.open_door4Set                                    = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors7_8_left.close_door1Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors5_6_left.close_door2Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors3_4_left.close_door3Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_left.close_door4Set                                   = @[Common.717.HCD]
-Entities.gmod_subway_81-714_mvm.Buttons.Doors1_2_right_outer.outer_open1Set                            = @[Common.717.HOD]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr7_8_rgh.door_lock8Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr5_6_rgh.door_lock7Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr3_4_rgh.door_lock6Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr1_2_rgh.door_lock5Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr7_8_lft.door_lock1Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr5_6_lft.door_lock2Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr3_4_lft.door_lock3Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_mvm.Buttons.bldr1_2_lft.door_lock4Toggle                                 = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight7_8.OpenDoor8Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight5_6.OpenDoor7Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight3_4.OpenDoor6Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight1_2.OpenDoor5Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight7_8.CloseDoor8Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight5_6.CloseDoor7Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight3_4.CloseDoor6Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsRight1_2.CloseDoor5Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft7_8.OpenDoor1Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft5_6.OpenDoor2Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft3_4.OpenDoor3Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft1_2.OpenDoor4Set                                    = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft7_8.CloseDoor1Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft5_6.CloseDoor2Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft3_4.CloseDoor3Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsLeft1_2.CloseDoor4Set                                   = @[Common.717.HCD]
+Entities.gmod_subway_81-714_mvm.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                             = @[Common.717.HOD]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight7_8.DoorLock8Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight5_6.DoorLock7Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight3_4.DoorLock6Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsRight1_2.DoorLock5Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft7_8.DoorLock1Toggle                            = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft5_6.DoorLock2Toggle                            = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft3_4.DoorLock3Toggle                            = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_mvm.Buttons.BlockDoorsLeft1_2.DoorLock4Toggle                            = @[Common.717.HDLK]
 Entities.gmod_subway_81-714_mvm.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]
 Entities.gmod_subway_81-714_mvm.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]
 Entities.gmod_subway_81-714_mvm.Buttons.DVR_87.DVRDisconnectToggle                              = @[Common.717.DVR87]
@@ -1254,31 +1254,31 @@ Entities.gmod_subway_81-714_lvz.Buttons.Pressures.!BCPressure = @[Common.ALL.BCP
 Entities.gmod_subway_81-714_lvz.Buttons.Pressures.!BLTLPressure = @[Common.ALL.BLTLPressure] #NEW
 
 #Doors manual controls
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_right.open_door8Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_right.open_door7Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_right.open_door6Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_right.open_door5Set                                  = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_right.close_door8Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_right.close_door7Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_right.close_door6Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_right.close_door5Set                                 = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_left.open_door1Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_left.open_door2Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_left.open_door3Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_left.open_door4Set                                   = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors7_8_left.close_door1Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors5_6_left.close_door2Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors3_4_left.close_door3Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_left.close_door4Set                                  = @[Common.717.HCD]
-Entities.gmod_subway_81-714_lvz.Buttons.Doors1_2_right_outer.outer_open1Set                           = @[Common.717.HOD]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr7_8_rgh.door_lock8Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr5_6_rgh.door_lock7Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr3_4_rgh.door_lock6Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr1_2_rgh.door_lock5Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr7_8_lft.door_lock1Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr5_6_lft.door_lock2Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr3_4_lft.door_lock3Toggle                                 = @[Common.717.HDLK]
-Entities.gmod_subway_81-714_lvz.Buttons.bldr1_2_lft.door_lock4Toggle                                 = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight7_8.OpenDoor8Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight5_6.OpenDoor7Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight3_4.OpenDoor6Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight1_2.OpenDoor5Set                                  = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight7_8.CloseDoor8Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight5_6.CloseDoor7Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight3_4.CloseDoor6Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsRight1_2.CloseDoor5Set                                 = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft7_8.OpenDoor1Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft5_6.OpenDoor2Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft3_4.OpenDoor3Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft1_2.OpenDoor4Set                                   = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft7_8.CloseDoor1Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft5_6.CloseDoor2Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft3_4.CloseDoor3Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsLeft1_2.CloseDoor4Set                                  = @[Common.717.HCD]
+Entities.gmod_subway_81-714_lvz.Buttons.DoorsOutRight1_2.OpenOutDoor1Set                            = @[Common.717.HOD]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight7_8.DoorLock8Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight5_6.DoorLock7Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight3_4.DoorLock6Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsRight1_2.DoorLock5Toggle                          = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft7_8.DoorLock1Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft5_6.DoorLock2Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft3_4.DoorLock3Toggle                           = @[Common.717.HDLK]
+Entities.gmod_subway_81-714_lvz.Buttons.BlockDoorsLeft1_2.DoorLock4Toggle                           = @[Common.717.HDLK]
 Entities.gmod_subway_81-714_lvz.Buttons.DoorReleaseLeft.DoorReleaseLeftToggle                   = @[Common.717.DoorReleaseLeft]
 Entities.gmod_subway_81-714_lvz.Buttons.DoorReleaseRight.DoorReleaseRightToggle                 = @[Common.717.DoorReleaseRight]
 Entities.gmod_subway_81-714_lvz.Buttons.DVR_87.DVRDisconnectToggle                              = @[Common.717.DVR87]