From d9ca806cf8f3f075032be884e3cd59e277c9e00d Mon Sep 17 00:00:00 2001 From: edshot99 Date: Fri, 26 Jan 2024 15:11:45 -0600 Subject: [PATCH] fix up scoreboard, stop spawning tfa guns in TTT, and add missing map --- blast/gamemodes/blast/gamemode/cl_scoreboard.lua | 4 ++-- blast/lua/weapons/blast_ammo-ba.lua | 2 +- blast/lua/weapons/blast_ammo-bu.lua | 2 +- blast/lua/weapons/blast_ammo-h.lua | 2 +- blast/lua/weapons/blast_ammo-hv.lua | 2 +- blast/lua/weapons/blast_ammo-m.lua | 2 +- blast/lua/weapons/blast_ammo-ri.lua | 2 +- blast/lua/weapons/blast_ammo-s.lua | 2 +- blast/lua/weapons/blast_awp.lua | 2 +- blast/lua/weapons/blast_deag.lua | 2 +- blast/lua/weapons/blast_dual.lua | 2 +- blast/lua/weapons/blast_equipment-baton.lua | 2 +- blast/lua/weapons/blast_equipment-boombox.lua | 2 +- blast/lua/weapons/blast_equipment-flash.lua | 2 +- blast/lua/weapons/blast_equipment-frag.lua | 2 +- blast/lua/weapons/blast_fiveseven.lua | 2 +- blast/lua/weapons/blast_g3.lua | 2 +- blast/lua/weapons/blast_galil.lua | 2 +- blast/lua/weapons/blast_glock.lua | 2 +- blast/lua/weapons/blast_m3.lua | 2 +- blast/lua/weapons/blast_m4.lua | 2 +- blast/lua/weapons/blast_mp5.lua | 2 +- blast/lua/weapons/blast_mp7.lua | 2 +- blast/lua/weapons/blast_p90.lua | 2 +- blast/lua/weapons/blast_rifle.lua | 2 +- blast/lua/weapons/blast_scoot.lua | 2 +- blast/lua/weapons/blast_tmp.lua | 2 +- blast/lua/weapons/blast_usp.lua | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/blast/gamemodes/blast/gamemode/cl_scoreboard.lua b/blast/gamemodes/blast/gamemode/cl_scoreboard.lua index a7db03a..961cddd 100644 --- a/blast/gamemodes/blast/gamemode/cl_scoreboard.lua +++ b/blast/gamemodes/blast/gamemode/cl_scoreboard.lua @@ -13,7 +13,7 @@ function scoreboard:show() local winColor = Color(LocalPlayer():GetPlayerColor().x * 255, LocalPlayer():GetPlayerColor().y * 255, LocalPlayer():GetPlayerColor().z * 255, 200) local playerlist = vgui.Create("DListView") - playerlist:SetSize(ScrW() / 4, ScrH() / 2.5) + playerlist:SetSize(ScrW() / 1.25, ScrH() / 2.5) playerlist:Center() playerlist:AddColumn("Name") playerlist:AddColumn("K/D Ratio") @@ -58,4 +58,4 @@ end function GM:ScoreboardHide() scoreboard:hide() -end \ No newline at end of file +end diff --git a/blast/lua/weapons/blast_ammo-ba.lua b/blast/lua/weapons/blast_ammo-ba.lua index 22ebf23..d4e3ad1 100644 --- a/blast/lua/weapons/blast_ammo-ba.lua +++ b/blast/lua/weapons/blast_ammo-ba.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_ammo-bu.lua b/blast/lua/weapons/blast_ammo-bu.lua index 7993038..e9541d7 100644 --- a/blast/lua/weapons/blast_ammo-bu.lua +++ b/blast/lua/weapons/blast_ammo-bu.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_ammo-h.lua b/blast/lua/weapons/blast_ammo-h.lua index 1fe19f4..d32930a 100644 --- a/blast/lua/weapons/blast_ammo-h.lua +++ b/blast/lua/weapons/blast_ammo-h.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_ammo-hv.lua b/blast/lua/weapons/blast_ammo-hv.lua index 2ef7cec..6b66e35 100644 --- a/blast/lua/weapons/blast_ammo-hv.lua +++ b/blast/lua/weapons/blast_ammo-hv.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_ammo-m.lua b/blast/lua/weapons/blast_ammo-m.lua index b28c697..af8186b 100644 --- a/blast/lua/weapons/blast_ammo-m.lua +++ b/blast/lua/weapons/blast_ammo-m.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_ammo-ri.lua b/blast/lua/weapons/blast_ammo-ri.lua index e0b928f..ae7e772 100644 --- a/blast/lua/weapons/blast_ammo-ri.lua +++ b/blast/lua/weapons/blast_ammo-ri.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_ammo-s.lua b/blast/lua/weapons/blast_ammo-s.lua index 30632c9..3cc5038 100644 --- a/blast/lua/weapons/blast_ammo-s.lua +++ b/blast/lua/weapons/blast_ammo-s.lua @@ -23,7 +23,7 @@ SWEP.ViewModel = "models/weapons/cstrike/c_c4.mdl" -- Weapon view model SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.ShowWorldModel = false SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.AdminSpawnable = true SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_awp.lua b/blast/lua/weapons/blast_awp.lua index d45d292..ccc0119 100644 --- a/blast/lua/weapons/blast_awp.lua +++ b/blast/lua/weapons/blast_awp.lua @@ -37,7 +37,7 @@ SWEP.WorldModel = "models/weapons/w_snip_awp.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_deag.lua b/blast/lua/weapons/blast_deag.lua index 2296ba6..f78364e 100644 --- a/blast/lua/weapons/blast_deag.lua +++ b/blast/lua/weapons/blast_deag.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_pist_deagle.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_dual.lua b/blast/lua/weapons/blast_dual.lua index 85e2abc..07d84c2 100644 --- a/blast/lua/weapons/blast_dual.lua +++ b/blast/lua/weapons/blast_dual.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_pist_elite.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_equipment-baton.lua b/blast/lua/weapons/blast_equipment-baton.lua index e3a7ec8..cbfa2d0 100644 --- a/blast/lua/weapons/blast_equipment-baton.lua +++ b/blast/lua/weapons/blast_equipment-baton.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_stunbaton.mdl" -- Weapon world model SWEP.Base = "tfa_knife_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_equipment-boombox.lua b/blast/lua/weapons/blast_equipment-boombox.lua index 421a6ec..671db08 100644 --- a/blast/lua/weapons/blast_equipment-boombox.lua +++ b/blast/lua/weapons/blast_equipment-boombox.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_slam.mdl" -- Weapon world model SWEP.Base = "tfa_knife_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_equipment-flash.lua b/blast/lua/weapons/blast_equipment-flash.lua index 696ade1..2033105 100644 --- a/blast/lua/weapons/blast_equipment-flash.lua +++ b/blast/lua/weapons/blast_equipment-flash.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_eq_flashbang.mdl" -- Weapon world model SWEP.Base = "tfa_nade_base" SWEP.Primary.Round = "blast_flash" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = true SWEP.FiresUnderwater = true diff --git a/blast/lua/weapons/blast_equipment-frag.lua b/blast/lua/weapons/blast_equipment-frag.lua index 68d39c2..da97879 100644 --- a/blast/lua/weapons/blast_equipment-frag.lua +++ b/blast/lua/weapons/blast_equipment-frag.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_grenade.mdl" -- Weapon world model SWEP.Base = "tfa_nade_base" SWEP.Primary.Round = "blast_frag" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = true SWEP.FiresUnderwater = true diff --git a/blast/lua/weapons/blast_fiveseven.lua b/blast/lua/weapons/blast_fiveseven.lua index 7766f82..7ba1cde 100644 --- a/blast/lua/weapons/blast_fiveseven.lua +++ b/blast/lua/weapons/blast_fiveseven.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_pist_fiveseven.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_g3.lua b/blast/lua/weapons/blast_g3.lua index ad8a2ca..5d47d68 100644 --- a/blast/lua/weapons/blast_g3.lua +++ b/blast/lua/weapons/blast_g3.lua @@ -37,7 +37,7 @@ SWEP.WorldModel = "models/weapons/w_snip_g3sg1.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_galil.lua b/blast/lua/weapons/blast_galil.lua index 831985c..35752f0 100644 --- a/blast/lua/weapons/blast_galil.lua +++ b/blast/lua/weapons/blast_galil.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_rif_galil.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_glock.lua b/blast/lua/weapons/blast_glock.lua index 493723a..9359626 100644 --- a/blast/lua/weapons/blast_glock.lua +++ b/blast/lua/weapons/blast_glock.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_pist_glock18.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_m3.lua b/blast/lua/weapons/blast_m3.lua index 97fe392..d79d305 100644 --- a/blast/lua/weapons/blast_m3.lua +++ b/blast/lua/weapons/blast_m3.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_shotgun.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_m4.lua b/blast/lua/weapons/blast_m4.lua index f9585d0..e0779d2 100644 --- a/blast/lua/weapons/blast_m4.lua +++ b/blast/lua/weapons/blast_m4.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_rif_m4a1.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_mp5.lua b/blast/lua/weapons/blast_mp5.lua index 907b9a4..3f9152e 100644 --- a/blast/lua/weapons/blast_mp5.lua +++ b/blast/lua/weapons/blast_mp5.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_smg_mp5.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_mp7.lua b/blast/lua/weapons/blast_mp7.lua index 66f25d7..e73fe2c 100644 --- a/blast/lua/weapons/blast_mp7.lua +++ b/blast/lua/weapons/blast_mp7.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_smg1.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_p90.lua b/blast/lua/weapons/blast_p90.lua index 879cd4d..284335b 100644 --- a/blast/lua/weapons/blast_p90.lua +++ b/blast/lua/weapons/blast_p90.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_smg_p90.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_rifle.lua b/blast/lua/weapons/blast_rifle.lua index 692362d..2dedb3d 100644 --- a/blast/lua/weapons/blast_rifle.lua +++ b/blast/lua/weapons/blast_rifle.lua @@ -50,7 +50,7 @@ SWEP.EventTable = { SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_scoot.lua b/blast/lua/weapons/blast_scoot.lua index d391f6a..e66f3e5 100644 --- a/blast/lua/weapons/blast_scoot.lua +++ b/blast/lua/weapons/blast_scoot.lua @@ -37,7 +37,7 @@ SWEP.WorldModel = "models/weapons/w_snip_scout.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_tmp.lua b/blast/lua/weapons/blast_tmp.lua index 663ffbd..fe76324 100644 --- a/blast/lua/weapons/blast_tmp.lua +++ b/blast/lua/weapons/blast_tmp.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_smg_tmp.mdl" -- Weapon world model SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false diff --git a/blast/lua/weapons/blast_usp.lua b/blast/lua/weapons/blast_usp.lua index de4e6fa..ef0c64f 100644 --- a/blast/lua/weapons/blast_usp.lua +++ b/blast/lua/weapons/blast_usp.lua @@ -36,7 +36,7 @@ SWEP.WorldModel = "models/weapons/w_pist_usp_silencer.mdl" -- Weapon world mo SWEP.Base = "tfa_gun_base" -SWEP.Spawnable = true +SWEP.Spawnable = false SWEP.UseHands = false SWEP.FiresUnderwater = false