Merge pull request #839 from MattJeanes/dev

Release 2023.4.1
MattJeanes · Mar 2, 2023 · 9574dcc · 9574dcc
2 parents 6412cf5 + 49ed3ee
commit 9574dcc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/i18n/languages/pt-BR.json b/i18n/languages/pt-BR.json
@@ -345,7 +345,7 @@
     "Settings.Sections.Exterior.Light.AlwaysOn": "Luz externa acesa por padrão",
     "Settings.Sections.Exterior.Light.AlwaysOn.Description": "A luz externa deve sempre estar acesa a menos que desativada pelo controle?",
     "Settings.Sections.Exterior.Light.ColorOverride": "Substituir Cor",
-    "Settings.Sections.Exterior.Light.ColorOverride.Description": "A cor substituta da luz externa",
+    "Settings.Sections.Exterior.Light.ColorOverride.Description": "Substitui a cor da luz externa",
     "Settings.Sections.Exterior.Light.EnableColorOverride": "Ativar Substituição de Cor da Luz",
     "Settings.Sections.Exterior.Light.EnableColorOverride.Description": "Controla a cor da luz externa",
     "Settings.Sections.Exterior.ProjectedLight": "Luz projetada pela porta",

diff --git a/i18n/languages/pt-PT.json b/i18n/languages/pt-PT.json
@@ -345,7 +345,7 @@
     "Settings.Sections.Exterior.Light.AlwaysOn": "Luz externa acesa por padrão",
     "Settings.Sections.Exterior.Light.AlwaysOn.Description": "A luz externa deve sempre estar acesa a menos que desativada pelo controle?",
     "Settings.Sections.Exterior.Light.ColorOverride": "Substituir Cor",
-    "Settings.Sections.Exterior.Light.ColorOverride.Description": "A cor substituta da luz externa",
+    "Settings.Sections.Exterior.Light.ColorOverride.Description": "Substitui a cor da luz externa",
     "Settings.Sections.Exterior.Light.EnableColorOverride": "Ativar Substituição de Cor da Luz",
     "Settings.Sections.Exterior.Light.EnableColorOverride.Description": "Controla a cor da luz externa",
     "Settings.Sections.Exterior.ProjectedLight": "Luz projetada pela porta",

diff --git a/lua/entities/gmod_tardis/modules/teleport/sh_tp_main.lua b/lua/entities/gmod_tardis/modules/teleport/sh_tp_main.lua
@@ -359,6 +359,10 @@ else
     ENT:OnMessage("stop_mat", function(self, data, ply)
         self:StopMat()
     end)
+
+    ENT:AddHook("ShouldTurnOffLight", "teleport", function(self)
+        if self:GetData("teleport", false) and self:GetData("alpha",255) == 0 then return true end
+    end)
 end
 
 function ENT:SetStepDelay()
@@ -367,7 +371,12 @@ function ENT:SetStepDelay()
     if not (demat or mat) then return end
 
     local teleport_md = self.metadata.Exterior.Teleport
-    local sequence_delays = demat and teleport_md.DematSequenceDelays or teleport_md.MatSequenceDelays
+    local sequence_delays
+    if demat then
+        sequence_delays = teleport_md.DematSequenceDelays
+    else
+        sequence_delays = teleport_md.MatSequenceDelays
+    end
     local step = self:GetData("step",1)
     if sequence_delays and sequence_delays[step] then
         self:SetData("step-delay",CurTime() + sequence_delays[step])

diff --git a/lua/entities/gmod_tardis_interior/modules/sh_scanner.lua b/lua/entities/gmod_tardis_interior/modules/sh_scanner.lua
@@ -97,17 +97,17 @@ end)
 ENT:AddHook("PreScannerRender", "scanner", function(self)
     for k,v in pairs(self.props) do
         if IsValid(k) then
-            k.olddraw=k:GetNoDraw()
+            k.olddrawscanner=k:GetNoDraw()
             k:SetNoDraw(true)
         end
     end
 end)
 
 ENT:AddHook("PostScannerRender", "scanner", function(self)
     for k,v in pairs(self.props) do
-        if IsValid(k) and k.olddraw~=nil then
-            k:SetNoDraw(k.olddraw)
-            k.olddraw=nil
+        if IsValid(k) and k.olddrawscanner~=nil then
+            k:SetNoDraw(false)
+            k.olddrawscanner=nil
         end
     end
-end)
+end)
diff --git a/lua/tardis/interiors/modules/sh_templates.lua b/lua/tardis/interiors/modules/sh_templates.lua
@@ -1,4 +1,4 @@
-local function AddInteriorPartsOffset(template, offset)
+function TARDIS:AddInteriorPartsOffset(template, offset)
     local moved = table.Copy(template)
 
     if istable(moved.Interior.Parts) then
@@ -39,7 +39,7 @@ local function AddInteriorPartsOffset(template, offset)
     return moved
 end
 
-local function AddInteriorPartsRotation(template, rotate_ang)
+function TARDIS:AddInteriorPartsRotation(template, rotate_ang)
     local rotated = table.Copy(template)
 
     if istable(rotated.Interior.Parts) then
@@ -111,10 +111,10 @@ function TARDIS:MergeInteriorTemplates(cur_metadata, apply_conditions, ent)
                 or (apply_conditions and template.condition and template.condition(id, ent:GetCreator(), ent)))
         then
             if template.parts_rotation then
-                template_metadata = AddInteriorPartsRotation(template_metadata, template.parts_rotation)
+                template_metadata = self:AddInteriorPartsRotation(template_metadata, template.parts_rotation)
             end
             if template.parts_offset then
-                template_metadata = AddInteriorPartsOffset(template_metadata, template.parts_offset)
+                template_metadata = self:AddInteriorPartsOffset(template_metadata, template.parts_offset)
             end
 
             if template.override then

diff --git a/lua/tardis/languages/pt-br.lua b/lua/tardis/languages/pt-br.lua
@@ -348,7 +348,7 @@ T.Phrases = {
     ["Settings.Sections.Exterior.Light.AlwaysOn"] = "Luz externa acesa por padrão",
     ["Settings.Sections.Exterior.Light.AlwaysOn.Description"] = "A luz externa deve sempre estar acesa a menos que desativada pelo controle?",
     ["Settings.Sections.Exterior.Light.ColorOverride"] = "Substituir Cor",
-    ["Settings.Sections.Exterior.Light.ColorOverride.Description"] = "A cor substituta da luz externa",
+    ["Settings.Sections.Exterior.Light.ColorOverride.Description"] = "Substitui a cor da luz externa",
     ["Settings.Sections.Exterior.Light.EnableColorOverride"] = "Ativar Substituição de Cor da Luz",
     ["Settings.Sections.Exterior.Light.EnableColorOverride.Description"] = "Controla a cor da luz externa",
     ["Settings.Sections.Exterior.ProjectedLight"] = "Luz projetada pela porta",

diff --git a/lua/tardis/languages/pt-pt.lua b/lua/tardis/languages/pt-pt.lua
@@ -348,7 +348,7 @@ T.Phrases = {
     ["Settings.Sections.Exterior.Light.AlwaysOn"] = "Luz externa acesa por padrão",
     ["Settings.Sections.Exterior.Light.AlwaysOn.Description"] = "A luz externa deve sempre estar acesa a menos que desativada pelo controle?",
     ["Settings.Sections.Exterior.Light.ColorOverride"] = "Substituir Cor",
-    ["Settings.Sections.Exterior.Light.ColorOverride.Description"] = "A cor substituta da luz externa",
+    ["Settings.Sections.Exterior.Light.ColorOverride.Description"] = "Substitui a cor da luz externa",
     ["Settings.Sections.Exterior.Light.EnableColorOverride"] = "Ativar Substituição de Cor da Luz",
     ["Settings.Sections.Exterior.Light.EnableColorOverride.Description"] = "Controla a cor da luz externa",
     ["Settings.Sections.Exterior.ProjectedLight"] = "Luz projetada pela porta",