Merge branch 'master' into master

lua/autorun/tas_weapons_init.lua

@@ -1,4 +1,9 @@
 TASWeapons = {
 	Category = "TAS Weapons",
-	Authors = { Derpius = "Derpius", Kilo = "Kilo", yousifgaming = "yousifgaming" }, --STEAM_0:0:547731733 Derpius, STEAM_0:0:84051936 Kilo, STEAM_0:0:193345966 yousifgaming
+	Authors = {
+		Derpius = "Derpius", -- STEAM_0:0:547731733 Derpius
+		Kilo = "Kilo", -- STEAM_0:0:84051936 Kilo
+		El_Patito = "el_patito", -- STEAM_0:0:572655757 el_patito_loco
+		yousifgaming = "yousifgaming", -- STEAM_0:0:193345966 yousifgaming
+	},
 }

lua/weapons/e.r.c.s.lua

@@ -0,0 +1,87 @@
+SWEP.Author = "el_patito_loco"
+SWEP.PrintName = "e.r.c.s" --"Experimental Rotating Chamber Sniper"
+SWEP.Category = TASWeapons.Category
+SWEP.Author = TASWeapons.Authors.El_Patito
+SWEP.Instructions =
+	[[Experimental Rotating Chamber Sniper - Left Click shoots a powerful 12.7 mm sniper round that will destroy your enemies!!
+At the moment our engineers are working on new features which will provide more mass destruction!!
+]]
+
+SWEP.Spawnable = true
+SWEP.AdminOnly = false
+
+SWEP.ViewModel = "models/weapons/v_357.mdl"
+SWEP.WorldModel = "models/weapons/w_357.mdl"
+
+local ShootSound = Sound("weapons/mortar/mortar_fire1.wav")
+
+SWEP.DrawWeaponInfoBox = true
+SWEP.IconOverride = "materials/entities/weapon_357.png"
+
+--ammo
+
+SWEP.Primary.ClipSize = -1
+SWEP.Primary.DefaultClip = -1
+SWEP.Primary.Automatic = true
+SWEP.Primary.Ammo = "none"
+
+SWEP.Secondary.ClipSize = -1
+SWEP.Secondary.DefaultClip = -1
+SWEP.Secondary.Automatic = true
+SWEP.Secondary.Ammo = "none"
+
+--Inventory related
+
+SWEP.Weight = 5
+SWEP.AutoSwitchTo = false
+SWEP.AutoSwitchFrom = false
+
+SWEP.Slot = 4
+SWEP.SlotPos = 3
+SWEP.DrawAmmo = false
+SWEP.DrawCrosshair = true
+
+--weapon properties
+
+SWEP.Primary.Recoil = 1
+SWEP.Primary.Damage = 75
+SWEP.Primary.NumShots = 10
+SWEP.Primary.Spread = 0
+SWEP.Primary.Delay = 1
+
+function SWEP:Initialize()
+	self:SetHoldType("revolver")
+end
+
+function SWEP:PrimaryAttack()
+	local owner = self:GetOwner()
+
+	local Bullet = {}
+	Bullet.Num = self.Primary.NumShots
+	Bullet.Src = owner:GetShootPos()
+	Bullet.Dir = owner:GetAimVector()
+	Bullet.Spread = Vector(self.Primary.Spread, self.Primary.Spread, 0)
+	Bullet.Tracer = 1
+	Bullet.TracerName = "AirboatGunTracer"
+	Bullet.Damage = self.Primary.Damage
+	Bullet.AmmoType = self.Primary.Ammo
+
+	local RecoilMultiplier = self.Primary.Recoil * -1
+	local RecoilRandomMultiplier = self.Primary.Recoil * math.Rand(-1, 1)
+
+	owner:ViewPunch(Angle(RecoilMultiplier, RecoilRandomMultiplier, RecoilMultiplier))
+
+	self:DoImpactEffect("GaussTracer")
+	self:FireBullets(Bullet)
+	self:ShootEffects()
+	self:EmitSound(ShootSound)
+	self:ShootEffects()
+	self:SetNextPrimaryFire(CurTime() + self.Primary.Delay)
+end
+
+if CLIENT then
+	killicon.AddAlias("e.r.c.s", "weapon_357") --Gives a killicon
+	language.Add("e.r.c.s", "E.R.C.S") -- This makes the name of the swep to be displayed in the kill feed.
+end
+
+function SWEP:SecondaryAttack() end