diff --git a/lua/acf/server/sv_acfbase.lua b/lua/acf/server/sv_acfbase.lua index 9a77603bc..6a8927461 100644 --- a/lua/acf/server/sv_acfbase.lua +++ b/lua/acf/server/sv_acfbase.lua @@ -135,11 +135,16 @@ function ACF_CalcDamage( Entity , Energy , FrAera , Angle ) local HitRes = {} - + if istable(Entity) == false then -- ACF feeds us a table for some reason when we shoot living things. + if (!Entity:IsNPC() and !Entity:IsPlayer()) and (!Entity:IsNextBot()) then -- Don't do this to living things! - + if Entity:GetCollisionBounds() != Entity:GetModelBounds() then -- Did they do the makespherical cheat? + armor = 1 + losArmor = 1 + end + end + end - local dmul = 1--This actually controls overall prop damage from rounds. It should be in globals but i'm suck's at Coding's -karb --BNK Stuff diff --git a/lua/acf/shared/guns/smoothbore.lua b/lua/acf/shared/guns/smoothbore.lua index c9ef9fca3..38dd7b880 100644 --- a/lua/acf/shared/guns/smoothbore.lua +++ b/lua/acf/shared/guns/smoothbore.lua @@ -42,7 +42,7 @@ ACF_defineGun("120mmSB", { } ) ACF_defineGun("140mmSB", { - name = "140mm Smoothbore Cannonn", + name = "140mm Smoothbore Cannon", desc = "The 140mm fires a massive shell with enormous penetrative capability, but has a glacial reload speed and a very hefty weight.", model = "models/tankgun_old/tankgun_140mm.mdl", gunclass = "SB",