Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
thecraftianman committed Feb 20, 2024
2 parents f9a58af + e3ec66a commit d8e9bcd
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions lua/weapons/gmod_tool/stools/acfarmorprop.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@ local ACF = ACF
local Contraption = ACF.Contraption
local IsValid = IsValid

TOOL.Category = (ACF.CustomToolCategory and ACF.CustomToolCategory:GetBool()) and "ACF" or "Construction"
TOOL.Name = "#tool.acfarmorprop.name"
TOOL.Command = nil
TOOL.ConfigName = ""
TOOL.Category = (ACF.CustomToolCategory and ACF.CustomToolCategory:GetBool()) and "ACF" or "Construction"
TOOL.Name = "#tool.acfarmorprop.name"
TOOL.Command = nil
TOOL.ConfigName = ""
TOOL.Information = {
{ name = "left" },
{ name = "right" },
{ name = "reload" }
}

TOOL.ClientConVar["thickness"] = 1
TOOL.ClientConVar["ductility"] = 0
Expand Down Expand Up @@ -68,8 +73,10 @@ end)

if CLIENT then
language.Add("tool.acfarmorprop.name", "ACF Armor Properties")
language.Add("tool.acfarmorprop.desc", "Sets the weight of a prop by desired armor thickness and ductility.")
language.Add("tool.acfarmorprop.0", "Left click to apply settings. Right click to copy settings. Reload to get the total mass of an object and all constrained objects.")
language.Add("tool.acfarmorprop.desc", "Sets the weight of a prop by desired armor thickness and ductility")
language.Add("tool.acfarmorprop.left", "Apply settings")
language.Add("tool.acfarmorprop.right", "Copy settings")
language.Add("tool.acfarmorprop.reload", "Get the total mass of an object and all constrained objects")

surface.CreateFont("Torchfont", { size = 40, weight = 1000, font = "arial" })

Expand Down

0 comments on commit d8e9bcd

Please sign in to comment.