aboutsummaryrefslogtreecommitdiff
path: root/gamemode/itemsystem
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-08-07 18:08:00 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-08-07 18:08:00 -0400
commit0ce40afcb04587bbccd39fc64a4928607c285c51 (patch)
tree8a82b316b7300864aca612c6b0c059e14c15bd37 /gamemode/itemsystem
parent076b4245a757dc0ca9d1c9d234c32df546b1239e (diff)
downloadartery-0ce40afcb04587bbccd39fc64a4928607c285c51.tar.gz
artery-0ce40afcb04587bbccd39fc64a4928607c285c51.tar.bz2
artery-0ce40afcb04587bbccd39fc64a4928607c285c51.zip
Various additions and removals for server
Diffstat (limited to 'gamemode/itemsystem')
-rw-r--r--gamemode/itemsystem/armor/balaclava.lua1
-rw-r--r--gamemode/itemsystem/exampleitem.lua2
-rw-r--r--gamemode/itemsystem/foodstuffs/ratmeat.lua1
-rw-r--r--gamemode/itemsystem/foodstuffs/watermelon.lua1
-rw-r--r--gamemode/itemsystem/quest/rougebadge.lua1
-rw-r--r--gamemode/itemsystem/quest/rougebook.lua1
-rw-r--r--gamemode/itemsystem/quest/togglechip.lua1
-rw-r--r--gamemode/itemsystem/scrapgun.lua1
-rw-r--r--gamemode/itemsystem/utility/flashlight.lua1
-rw-r--r--gamemode/itemsystem/weapons/knuckledclaw.lua1
-rw-r--r--gamemode/itemsystem/weapons/rustyaxe.lua7
-rw-r--r--gamemode/itemsystem/weapons/scraphammer.lua1
-rw-r--r--gamemode/itemsystem/weapons/seratedknife.lua1
13 files changed, 15 insertions, 5 deletions
diff --git a/gamemode/itemsystem/armor/balaclava.lua b/gamemode/itemsystem/armor/balaclava.lua
index cd31f97..0bd16c7 100644
--- a/gamemode/itemsystem/armor/balaclava.lua
+++ b/gamemode/itemsystem/armor/balaclava.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique
diff --git a/gamemode/itemsystem/exampleitem.lua b/gamemode/itemsystem/exampleitem.lua
index 82483e6..6beb1f6 100644
--- a/gamemode/itemsystem/exampleitem.lua
+++ b/gamemode/itemsystem/exampleitem.lua
@@ -90,8 +90,6 @@ end
item.onDropped = function(self,ent)
print("I've been dropped!(BUVVV WUB WUB WUB WUB WUB)")
end
-
-print("Hello from exampleitem.lua")
--Don't forget to register the item!
local itm = nrequire("item.lua")
itm.RegisterItem(item)
diff --git a/gamemode/itemsystem/foodstuffs/ratmeat.lua b/gamemode/itemsystem/foodstuffs/ratmeat.lua
index 0198e87..e8d9575 100644
--- a/gamemode/itemsystem/foodstuffs/ratmeat.lua
+++ b/gamemode/itemsystem/foodstuffs/ratmeat.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique
diff --git a/gamemode/itemsystem/foodstuffs/watermelon.lua b/gamemode/itemsystem/foodstuffs/watermelon.lua
index 3f858d7..d3dfd56 100644
--- a/gamemode/itemsystem/foodstuffs/watermelon.lua
+++ b/gamemode/itemsystem/foodstuffs/watermelon.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
local pac
if SERVER then
diff --git a/gamemode/itemsystem/quest/rougebadge.lua b/gamemode/itemsystem/quest/rougebadge.lua
index d5e2950..df5a149 100644
--- a/gamemode/itemsystem/quest/rougebadge.lua
+++ b/gamemode/itemsystem/quest/rougebadge.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique
diff --git a/gamemode/itemsystem/quest/rougebook.lua b/gamemode/itemsystem/quest/rougebook.lua
index 7afb5db..409948a 100644
--- a/gamemode/itemsystem/quest/rougebook.lua
+++ b/gamemode/itemsystem/quest/rougebook.lua
@@ -1,6 +1,7 @@
--[[
A quest item for the prayer book quest
]]
+do return end
local item = {}
item.Name = "Orders of the Silent Circle"
diff --git a/gamemode/itemsystem/quest/togglechip.lua b/gamemode/itemsystem/quest/togglechip.lua
index d920497..52e69aa 100644
--- a/gamemode/itemsystem/quest/togglechip.lua
+++ b/gamemode/itemsystem/quest/togglechip.lua
@@ -1,6 +1,7 @@
--[[
A toggle chip (quest item) for subterr_generator quest
]]
+do return end
local item = {}
item.Name = "Toggle Chip"
diff --git a/gamemode/itemsystem/scrapgun.lua b/gamemode/itemsystem/scrapgun.lua
index 66222d5..ea3d67f 100644
--- a/gamemode/itemsystem/scrapgun.lua
+++ b/gamemode/itemsystem/scrapgun.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique
diff --git a/gamemode/itemsystem/utility/flashlight.lua b/gamemode/itemsystem/utility/flashlight.lua
index fa1e3c5..6b0a40c 100644
--- a/gamemode/itemsystem/utility/flashlight.lua
+++ b/gamemode/itemsystem/utility/flashlight.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique
diff --git a/gamemode/itemsystem/weapons/knuckledclaw.lua b/gamemode/itemsystem/weapons/knuckledclaw.lua
index 0665a98..c738f2e 100644
--- a/gamemode/itemsystem/weapons/knuckledclaw.lua
+++ b/gamemode/itemsystem/weapons/knuckledclaw.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique
diff --git a/gamemode/itemsystem/weapons/rustyaxe.lua b/gamemode/itemsystem/weapons/rustyaxe.lua
index 359580f..930a736 100644
--- a/gamemode/itemsystem/weapons/rustyaxe.lua
+++ b/gamemode/itemsystem/weapons/rustyaxe.lua
@@ -1,6 +1,7 @@
--[[
An axe that you can swing around!
]]
+do return end
local pac,swi
if SERVER then
pac = nrequire("core/pac/sv_pac.lua")
@@ -78,7 +79,7 @@ item.pacname = "rustyaxe"
if SERVER then
--Before makeSwingable is called, an item needs a .Name field and a .attacks field and a .pacname field
- swi.makeSwingable(item)
+ --swi.makeSwingable(item)
end
--[[
local swingdata = {
@@ -239,7 +240,7 @@ item.onClick = function(self,owner)
end
]]
---[[
+
--Optional, if we should do something special on equip(like draw the PAC for this weapon)
item.onEquip = function(self,who)
print("onEquip",who)
@@ -261,7 +262,7 @@ item.onUnEquip = function(self,who)
who:GetActiveWeapon():SetHoldType("normal")
if SERVER then pac.RemovePac(who,"rustyaxe") end
end
-]]
+
item.onDropped = function(self, ent)
if SERVER then pac.ApplyPac(ent,"rustyaxe") end
end
diff --git a/gamemode/itemsystem/weapons/scraphammer.lua b/gamemode/itemsystem/weapons/scraphammer.lua
index 762dc5f..2534907 100644
--- a/gamemode/itemsystem/weapons/scraphammer.lua
+++ b/gamemode/itemsystem/weapons/scraphammer.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local com = nrequire("core/inventory/common/weapons.lua")
local itm = nrequire("core/inventory/common/items.lua")
local reg = nrequire("core/inventory/item.lua")
diff --git a/gamemode/itemsystem/weapons/seratedknife.lua b/gamemode/itemsystem/weapons/seratedknife.lua
index ee116aa..738beb6 100644
--- a/gamemode/itemsystem/weapons/seratedknife.lua
+++ b/gamemode/itemsystem/weapons/seratedknife.lua
@@ -1,6 +1,7 @@
--[[
An example item
]]
+do return end
local item = {}
--Required, a name, all item names must be unique