Merge branch 'master' of ssh://cogarr.net:43/home/git/gmstranded

2 files changed, 6 insertions, 5 deletions

diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua
index 9278e96..c820f20 100644
--- a/gamemode/itemsystem/items/deaddroppable.lua
+++ b/gamemode/itemsystem/items/deaddroppable.lua
@@ -42,6 +42,7 @@ local tbl = {
   {"Resin","Something you can craft with!","items/resin.png"},
   {"Rope","Something you can craft with!","items/rope.png"},
   {"Salmon","Something you can craft with!","items/salmon.png"},
+  {"Saltpetre","Something you can craft with!","items/saltpetre.png"},
   {"Sand","How in the world are you holding this stuff?","items/sand.png"},
   {"Shark","Something you can craft with!","items/shark.png"},
   {"Silver","Something you can craft with!","items/ingot_silver.png"},
@@ -51,7 +52,7 @@ local tbl = {
   {"Steel Ore","Something you can craft with!","items/ore_steel.png"},
   {"Stone","Something you can craft with!","items/stone.png"},
   {"Strange Stone","Something you can craft with!","items/sulpher.png"},
-  {"Sulpher","Watch out, it's explosive!","items/sulpher.png"},
+  {"Sulphur","Watch out, it's explosive!","items/sulphur.png"},
   {"Teak","You've got wood.","items/wood_teak.png"},
   {"Tech","You're blinded by SCIENCE!","items/ingot_tech.png"},
   {"Tech Ore","Something you can craft with!","items/ore_tech.png"},
diff --git a/gamemode/itemsystem/items/medicine.lua b/gamemode/itemsystem/items/medicine.lua
index 1281883..405188d 100644
--- a/gamemode/itemsystem/items/medicine.lua
+++ b/gamemode/itemsystem/items/medicine.lua
@@ -11,14 +11,14 @@ if(SERVER) then
 end
 
 local client_use = function()
-	net.Start("gms_eatberry")
+	net.Start("gms_usemedicine")
   net.SendToServer()
 end
 
 local finisheduseing = function(player)
-	self.Owner:DecResource( "Medicine", 1 )
-	self.Owner:SendMessage( "You're feeling a bit better now.", 3, Color( 10, 200, 10, 255 ) )
-	self.Owner:Heal( 10 )
+	player:DecResource( "Medicine", 1 )
+	player:SendMessage( "You're feeling a bit better now.", 3, Color( 10, 200, 10, 255 ) )
+	player:Heal( 10 )
 end
 
 local use_medicine = function(ln, player)