diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-05 23:07:49 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-05 23:07:49 -0400 |
| commit | 91f43cff95bd402e738180c53fbf0482e799cf19 (patch) | |
| tree | 3bceb17037b4af73079ce82559fa7362f6e17d1c /gamemode/craftablesystem | |
| parent | 67d8e45b7af28aee1fb865c2108725d19c04ca52 (diff) | |
| parent | 45392b8691d82bafe1aa405c44ed7fe5808ca293 (diff) | |
| download | gmstranded-91f43cff95bd402e738180c53fbf0482e799cf19.tar.gz gmstranded-91f43cff95bd402e738180c53fbf0482e799cf19.tar.bz2 gmstranded-91f43cff95bd402e738180c53fbf0482e799cf19.zip | |
Merge branch 'master' of ssh://cogarr.net:43/home/git/gmstranded
Diffstat (limited to 'gamemode/craftablesystem')
| -rw-r--r-- | gamemode/craftablesystem/playermade/medicine.lua | 1 | ||||
| -rw-r--r-- | gamemode/craftablesystem/playermade/urine.lua | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/gamemode/craftablesystem/playermade/medicine.lua b/gamemode/craftablesystem/playermade/medicine.lua index 223cc1c..998c1a2 100644 --- a/gamemode/craftablesystem/playermade/medicine.lua +++ b/gamemode/craftablesystem/playermade/medicine.lua @@ -2,6 +2,7 @@ local COMBI = {} COMBI.Name = "Medicine" COMBI.Description = "To restore your health." +COMBI.Icon = "items/medicine.png" COMBI.Req = {} COMBI.Req["Herbs"] = 7 diff --git a/gamemode/craftablesystem/playermade/urine.lua b/gamemode/craftablesystem/playermade/urine.lua index aed7d35..ae05626 100644 --- a/gamemode/craftablesystem/playermade/urine.lua +++ b/gamemode/craftablesystem/playermade/urine.lua @@ -3,6 +3,7 @@ local COMBI = {} COMBI.Name = "Urine" COMBI.Description = "Drink some water and wait, used in gunpowder production." +COMBI.Icon = "items/bottle_urine.png" COMBI.Req = {} COMBI.Req["Water Bottles"] = 2 @@ -17,6 +18,7 @@ local COMBI = {} COMBI.Name = "Urine 10x" COMBI.Description = "Drink loads of water and wait, messy, but used in gunpowder production." +COMBI.Icon = "items/bottle_urine.png" COMBI.Req = {} COMBI.Req["Water Bottles"] = 20 @@ -25,3 +27,19 @@ COMBI.Results = {} COMBI.Results["Urine Bottles"] = 10 GMS.RegisterCombi( COMBI, "Combinations" ) + +/* Urine 50x */ +local COMBI = {} + +COMBI.Name = "Urine 50x" +COMBI.Description = "Drink loads of water and wait, messy, but used in gunpowder production." +COMBI.Icon = "items/bottle_urine.png" + +COMBI.Req = {} +COMBI.Req["Water Bottles"] = 100 + +COMBI.Results = {} +COMBI.Results["Urine Bottles"] = 50 + +GMS.RegisterCombi( COMBI, "Combinations" ) + |