Updates

2 files changed, 17 insertions, 14 deletions

diff --git a/gamemode/inventorysystem/equipment/cl_equipment.lua b/gamemode/inventorysystem/equipment/cl_equipment.lua
index 7abd27a..22458c7 100644
--- a/gamemode/inventorysystem/equipment/cl_equipment.lua
+++ b/gamemode/inventorysystem/equipment/cl_equipment.lua
@@ -7,64 +7,66 @@ local inv = {}
 local width, height = (ScrW() / 4) - 25, ScrH()
 local iconsize = width / 5
 
-local ringmat = svg.MaterialFromSVG("materials/svg/delapouite/originals/svg/000000/transparent/ring.svg")
+local ucol = col.console.black
+
+local ringmat = svg.MaterialFromSVG("materials/svg/delapouite/originals/svg/000000/transparent/ring.svg", nil, ucol)
 
 --Positions for the eqipment inventory
 local eqp = {
 	["Head"] = {
 		x = (width / 2) - (iconsize / 2),
 		y = 0,
-		img = svg.MaterialFromSVG("materials/svg/lorc/originals/svg/000000/transparent/cracked-helm.svg"),
+		img = svg.MaterialFromSVG("materials/svg/lorc/originals/svg/000000/transparent/cracked-helm.svg", nil, ucol),
 	},
 	["Shoulders"] = {
 		x = (width / 2) - (iconsize / 2),
 		y = iconsize,
-		img =  svg.MaterialFromSVG("materials/svg/skoll/originals/svg/000000/transparent/pauldrons.svg")
+		img =  svg.MaterialFromSVG("materials/svg/skoll/originals/svg/000000/transparent/pauldrons.svg", nil, ucol)
 	},
 	["Chest"] = {
 		x = width / 2,
 		y = iconsize * 2,
-		img = svg.MaterialFromSVG("materials/svg/willdabeast/deviations/svg/000000/transparent/chain-mail.svg")
+		img = svg.MaterialFromSVG("materials/svg/willdabeast/deviations/svg/000000/transparent/chain-mail.svg", nil, ucol)
 	},
 	["Back"] = {
 		x = (width / 2) - iconsize,
 		y = iconsize * 2,
-		img = svg.MaterialFromSVG("materials/svg/lorc/originals/svg/000000/transparent/knapsack.svg"),
+		img = svg.MaterialFromSVG("materials/svg/lorc/originals/svg/000000/transparent/knapsack.svg", nil, ucol),
 	},
 	["Arms"] = {
 		x = (width / 2) - (iconsize / 2),
 		y = iconsize * 3,
-		img = svg.MaterialFromSVG("materials/svg/skoll/originals/svg/000000/transparent/bracers.svg")
+		img = svg.MaterialFromSVG("materials/svg/skoll/originals/svg/000000/transparent/bracers.svg", nil, ucol)
 	},
 	["Belt"] = {
 		x = (width / 2) - (iconsize * 1.5),
 		y = iconsize * 3,
-		img = svg.MaterialFromSVG("materials/svg/lucasms/equipment/svg/000000/transparent/belt.svg")
+		img = svg.MaterialFromSVG("materials/svg/lucasms/equipment/svg/000000/transparent/belt.svg", nil, ucol)
 	},
 	["Gloves"] = {
 		x = (width / 2) + (iconsize / 2),
 		y = iconsize * 3,
-		img = svg.MaterialFromSVG("materials/svg/delapouite/originals/svg/000000/transparent/gloves.svg")
+		img = svg.MaterialFromSVG("materials/svg/delapouite/originals/svg/000000/transparent/gloves.svg", nil, ucol)
 	},
 	["Left Hand"] = {
 		x = width / 2,
 		y = iconsize * 4,
-		img = svg.MaterialFromSVG("materials/svg/sbed/originals/svg/000000/transparent/shield.svg")
+		img = svg.MaterialFromSVG("materials/svg/sbed/originals/svg/000000/transparent/shield.svg", nil, ucol)
 	},
 	["Right Hand"] = {
 		x = (width / 2) - iconsize,
 		y = iconsize * 4,
-		img = svg.MaterialFromSVG("materials/svg/delapouite/originals/svg/000000/transparent/thor-hammer.svg")
+		img = svg.MaterialFromSVG("materials/svg/delapouite/originals/svg/000000/transparent/thor-hammer.svg", nil, ucol)
 	},
 	["Legs"] = {
 		x = (width / 2) - iconsize,
 		y = iconsize * 5,
-		img = svg.MaterialFromSVG("materials/svg/irongamer/originals/svg/000000/transparent/armored-pants.svg")
+		img = svg.MaterialFromSVG("materials/svg/irongamer/originals/svg/000000/transparent/armored-pants.svg", nil, ucol)
 	},
 	["Feet"] = {
 		x = width / 2,
 		y = iconsize * 5,
-		img = svg.MaterialFromSVG("materials/svg/lorc/originals/svg/000000/transparent/boots.svg"),
+		img = svg.MaterialFromSVG("materials/svg/lorc/originals/svg/000000/transparent/boots.svg", nil, ucol),
 	},
 	["Ring 1"] = {
 		x = 0,
diff --git a/gamemode/inventorysystem/equipment/sh_equipment.lua b/gamemode/inventorysystem/equipment/sh_equipment.lua
index 3c30df15..793eeac 100644
--- a/gamemode/inventorysystem/equipment/sh_equipment.lua
+++ b/gamemode/inventorysystem/equipment/sh_equipment.lua
@@ -4,6 +4,7 @@
 local itm = nrequire("item.lua")
 local ste = nrequire("utility/stream.lua")
 local inventory = nrequire("inventory/inventory.lua")
+local col = nrequire("config/colortheme.lua")
 print("Got invnetory table, it is:")
 PrintTable(inventory)
 local slots = {
@@ -77,7 +78,7 @@ end
 
 inv.Put = function(self,position,item)
 	self.equiped[position[1]] = item
-	if item.onEquip then item:onEquip(self.owner) end
+	if item.onEquip then item:onEquip(self.Owner) end
 end
 
 inv.Has = function(self,string_or_compare_func)
@@ -97,7 +98,7 @@ end
 
 inv.Remove = function(self,position)
 	local item = self.equiped[position[1]]
-	if item.onUnEquip then item:onUnEquip(self.owner) end
+	if item.onUnEquip then item:onUnEquip(self.Owner) end
 	self.equiped[position[1]] = nil
 end