Skip to content

Fix non-wire thrusters/wheels model lists #3412

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 2 commits into from
Aug 14, 2025
Merged

Fix non-wire thrusters/wheels model lists #3412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aaba74
Fix default thrusters/wheels models
Astralcircle Aug 13, 2025
50730e3
Missing newline
Astralcircle Aug 14, 2025
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
23 changes: 0 additions & 23 deletions lua/wire/client/cl_modelplug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,6 @@ local externalModels = {
{"Wire_button_Models", "models/props_mining/freightelevatorbutton02.mdl"},
{"Wire_button_Models", "models/props_mining/switch01.mdl"},
{"Wire_button_Models", "models/props_mining/switch_updown01.mdl"},
-- These seem to be missing from wire itself. Where are they? Who knows?!
-- {"ThrusterModels", "models/jaanus/thruster_invisi.mdl"},
-- {"ThrusterModels", "models/jaanus/thruster_shoop.mdl"},
-- {"ThrusterModels", "models/jaanus/thruster_smile.mdl"},
-- {"ThrusterModels", "models/jaanus/thruster_muff.mdl"},
-- {"ThrusterModels", "models/jaanus/thruster_rocket.mdl"},
-- {"ThrusterModels", "models/jaanus/thruster_megaphn.mdl"},
-- {"ThrusterModels", "models/jaanus/thruster_stun.mdl"},
-- {"Wire_Value_Models", "models/cheeze/wires/chip.mdl"},
{"WireTeleporterModels", "models/props_c17/pottery03a.mdl"},
{"Wire_Keyboard_Models", "models/props/kb_mouse/keyboard.mdl"},
}
Expand Down Expand Up @@ -190,14 +181,6 @@ ModelPlug.ListAddGenerics("WireSounds", {
["Breathing"] = "k_lab.teleport_breathing"
})

--some extra wheels that wired wheels have
ModelPlug.ListAddModels("WheelModels", {
"models/props_wasteland/wheel01a.mdl",
"models/props_wasteland/wheel02a.mdl",
"models/props_wasteland/wheel03a.mdl",
"models/props_wasteland/wheel03b.mdl"
}, { wheel_rx = 90, wheel_ry = 0, wheel_rz = 90} )

ModelPlug.ListAddModels("Wire_button_Models", {
"models/props_citizen_tech/Firetrap_button01a.mdl",
"models/props_c17/clock01.mdl",
Expand Down Expand Up @@ -264,12 +247,6 @@ ModelPlug.ListAddModels("Wire_button_Models", {
"models/bull/buttons/key_switch.mdl"
})

ModelPlug.ListAddModels("ThrusterModels", {
"models/props_junk/garbage_metalcan001a.mdl",
"models/jaanus/thruster_flat.mdl",
"models/fasteroid/computerfan.mdl"
})

ModelPlug.ListAddModels("Wire_Explosive_Models", {
"models/dav0r/tnt/tnt.mdl",
"models/Combine_Helicopter/helicopter_bomb01.mdl",
Expand Down
6 changes: 5 additions & 1 deletion lua/wire/stools/thruster.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,9 @@ function TOOL.BuildCPanel(panel)
panel:CheckBox("#WireThrusterTool_owater", "wire_thruster_owater")
panel:CheckBox("#WireThrusterTool_uwater", "wire_thruster_uwater")
end
--from model pack 1

-- Allow some custom models for thrusters
list.Set( "ThrusterModels", "models/props_junk/garbage_metalcan001a.mdl", {} )
list.Set( "ThrusterModels", "models/jaanus/thruster_flat.mdl", {} )
list.Set( "ThrusterModels", "models/fasteroid/computerfan.mdl", {} )
list.Set( "ThrusterModels", "models/jaanus/wiretool/wiretool_speed.mdl", {} )
2 changes: 0 additions & 2 deletions lua/wire/stools/vthruster.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,5 +244,3 @@ function TOOL.BuildCPanel(panel)
panel:CheckBox("#WireVThrusterTool_Angle", "wire_vthruster_angleinputs")
panel:CheckBox("#WireVThrusterTool_LengthIsMul", "wire_vthruster_lengthismul")
end

list.Set( "ThrusterModels", "models/jaanus/wiretool/wiretool_speed.mdl", {} )
6 changes: 6 additions & 0 deletions lua/wire/stools/wheel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,9 @@ function TOOL.BuildCPanel( panel )
frictionPanel:SetTooltip("How quickly the wheel comes to a stop. Note: An existing wheel's friction cannot be updated")
panel:CheckBox("#tool.wheel.nocollide", "wire_wheel_nocollide")
end

-- Allow some custom models for wheels
list.Set("WheelModels", "models/props_wasteland/wheel01a.mdl", { wheel_rx = 90, wheel_ry = 0, wheel_rz = 90 })
list.Set("WheelModels", "models/props_wasteland/wheel02a.mdl", { wheel_rx = 90, wheel_ry = 0, wheel_rz = 90 })
list.Set("WheelModels", "models/props_wasteland/wheel03a.mdl", { wheel_rx = 90, wheel_ry = 0, wheel_rz = 90 })
list.Set("WheelModels", "models/props_wasteland/wheel03b.mdl", { wheel_rx = 90, wheel_ry = 0, wheel_rz = 90 })
Loading