diff --git a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx index f186b97..40d0319 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx index ff1de8c..c92e847 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.mdl b/beatrun/Beatrun Reanimated/climbanim.mdl index 72f0029..2c881f6 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.mdl and b/beatrun/Beatrun Reanimated/climbanim.mdl differ diff --git a/beatrun/Beatrun Reanimated/climbanim.sw.vtx b/beatrun/Beatrun Reanimated/climbanim.sw.vtx index fe875a1..18f2757 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.sw.vtx and b/beatrun/Beatrun Reanimated/climbanim.sw.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.vvd b/beatrun/Beatrun Reanimated/climbanim.vvd index 1ab3838..20d010b 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.vvd and b/beatrun/Beatrun Reanimated/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx index f186b97..40d0319 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx index ff1de8c..c92e847 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl index 72f0029..2c881f6 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl and b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx index fe875a1..18f2757 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd index 1ab3838..20d010b 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd and b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/0_Misc.lua b/beatrun/gamemodes/beatrun/gamemode/sh/0_Misc.lua index 466db84..9d9fda2 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/0_Misc.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/0_Misc.lua @@ -6,7 +6,7 @@ if SERVER then local spawn = {"PlayerGiveSWEP", "PlayerSpawnEffect", "PlayerSpawnNPC", "PlayerSpawnObject", "PlayerSpawnProp", "PlayerSpawnRagdoll", "PlayerSpawnSENT", "PlayerSpawnSWEP", "PlayerSpawnVehicle"} local function BlockSpawn(ply) - if not ply:IsAdmin() and not allowPropSpawn:GetBool() then return false end + if ply:IsAdmin() or allowPropSpawn:GetBool() then return true end end for _, v in ipairs(spawn) do diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua index fea11c3..6820a05 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua @@ -60,11 +60,7 @@ net.Receive("RollAnimSP", function() local ply = LocalPlayer() if net.ReadBool() then - if ply:UsingRH() then - roll.AnimString = "land" - else - roll.AnimString = "landgun" - end + roll.AnimString = ply:UsingRH() and "land" or "landgun" roll.animmodelstring = "climbanim" roll.BodyAnimSpeed = 1 elseif net.ReadBool() then @@ -72,12 +68,7 @@ net.Receive("RollAnimSP", function() roll.animmodelstring = "climbanim" roll.BodyAnimSpeed = 1.5 else - if ply:UsingRH() then - roll.AnimString = "meroll" - else - roll.AnimString = "merollgun" - end - + roll.AnimString = ply:UsingRH() and "meroll" or "merollgun" roll.animmodelstring = "climbanim" roll.BodyAnimSpeed = 1.15 end @@ -167,12 +158,7 @@ hook.Add("OnPlayerHitGround", "SafetyRoll", function(ply, water, floater, speed) ply:SetSafetyRollAng(landang) ply:SetSafetyRollTime(CurTime() + 0.6) - if ply:UsingRH() then - roll.AnimString = "land" - else - roll.AnimString = "landgun" - end - + roll.AnimString = ply:UsingRH() and "land" or "landgun" roll.animmodelstring = "climbanim" roll.usefullbody = true else @@ -181,12 +167,7 @@ hook.Add("OnPlayerHitGround", "SafetyRoll", function(ply, water, floater, speed) ply:SetSafetyRollAng(ang) ply:SetSafetyRollTime(CurTime() + 1.05) - if ply:UsingRH() then - roll.AnimString = "meroll" - else - roll.AnimString = "merollgun" - end - + roll.AnimString = ply:UsingRH() and "meroll" or "merollgun" roll.animmodelstring = "climbanim" roll.usefullbody = false end