From f6034b5296961565f29cd86b3156a301cc1f28d9 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 30 Jan 2015 23:55:12 +0000 Subject: [PATCH 1/2] Added a system to chain arguments through source and gamemode entities. --- gamemodes/zombiesurvival/gamemode/obj_entity_extend_sv.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gamemodes/zombiesurvival/gamemode/obj_entity_extend_sv.lua b/gamemodes/zombiesurvival/gamemode/obj_entity_extend_sv.lua index 02077cd..decb363 100644 --- a/gamemodes/zombiesurvival/gamemode/obj_entity_extend_sv.lua +++ b/gamemodes/zombiesurvival/gamemode/obj_entity_extend_sv.lua @@ -87,14 +87,14 @@ function meta:FireOutput(outpt, activator, caller, args) local intab = self[outpt] if intab then for key, tab in pairs(intab) do + local param = ((tab.args == "") and args) or tab.args for __, subent in pairs(self:FindByNameHammer(tab.entityname, activator, caller)) do local delay = tonumber(tab.delay) if delay == nil or delay <= 0 then - subent:Input(tab.input, activator, caller, tab.args) + subent:Input(tab.input, activator, caller, param) else local inp = tab.input - local args = tab.args - timer.Simple(delay, function() if subent:IsValid() then subent:Input(inp, activator, caller, args) end end) + timer.Simple(delay, function() if subent:IsValid() then subent:Input(inp, activator, caller, param) end end) end end end From 08e90a1d8abbe63c52f841a987fc80895d9b2750 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 30 Jan 2015 23:56:38 +0000 Subject: [PATCH 2/2] Fixed base gun display on scrolling to a map slot weapon. --- .../entities/weapons/weapon_map_base/shared.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua index 0dd3377..215db85 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua @@ -40,7 +40,11 @@ end function SWEP:Deploy() if SERVER then - self.Owner:SelectWeapon("weapon_zs_fists") + if GAMEMODE.ZombieEscape then + self.Owner:SelectWeapon("weapon_zs_zeknife") + else + self.Owner:SelectWeapon("weapon_zs_fists") + end end return true end