Skip to content

Remove wire turret whitelist #3566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astralcircle merged 3 commits into from
Mar 29, 2026
Merged

Remove wire turret whitelist #3566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e14584
Remove turret models whitelist
Astralcircle Mar 28, 2026
249ca03
Check for attachment
Astralcircle Mar 28, 2026
179860f
Don't rely on physobj
Astralcircle Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lua/entities/gmod_wire_turret.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ function ENT:Initialize()
self.Firing = false
self.spreadvector = Vector()
self.effectdata = EffectData()
self.attachmentPos = phys:WorldToLocal(self:GetAttachment(1).Pos)

-- Not all entities have an 1 attachment
local attachment = self:GetAttachment(1)
self.attachmentPos = attachment and self:WorldToLocal(attachment.Pos) or vector_origin

self.Inputs = WireLib.CreateSpecialInputs(self,
{ "Fire", "Force", "Damage", "NumBullets", "Spread", "Delay", "Sound", "Tracer" },
Expand Down
14 changes: 0 additions & 14 deletions lua/wire/stools/turret.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,6 @@ if SERVER then
end
end

local ValidTurretModels = {
["models/weapons/w_smg1.mdl"] = true,
["models/weapons/w_smg_mp5.mdl"] = true,
["models/weapons/w_smg_mac10.mdl"] = true,
["models/weapons/w_rif_m4a1.mdl"] = true,
["models/weapons/w_357.mdl"] = true,
["models/weapons/w_shot_m3super90.mdl"] = true
}

function TOOL:GetModel()
local model = WireToolObj.GetModel(self)
return ValidTurretModels[model] and model or "models/weapons/w_smg1.mdl"
end

function TOOL.BuildCPanel( CPanel )
WireToolHelpers.MakePresetControl(CPanel, "wire_turret")

Expand Down
Loading