Finsihed moveing things out of combinations2

14 files changed, 1183 insertions, 1164 deletions

diff --git a/gamemode/combinations.lua b/gamemode/combinations.lua
index 9e2effd..e88107f 100644
--- a/gamemode/combinations.lua
+++ b/gamemode/combinations.lua
@@ -1,12 +1,5 @@
 
 
-
-GMS.Combinations = {}
-function GMS.RegisterCombi( tbl, group )
-	if ( !GMS.Combinations[ group ] ) then GMS.Combinations[ group ] = {} end
-	GMS.Combinations[ group ][ string.Replace( tbl.Name, " ", "_" ) ] = tbl
-end
-
 //Moved to craftablesystem/playermade/
 
 /* ------------------------ Structures ------------------------*/
diff --git a/gamemode/combinations2.lua b/gamemode/combinations2.lua
index bf31327..f73b125 100644
--- a/gamemode/combinations2.lua
+++ b/gamemode/combinations2.lua
@@ -1,1196 +1,54 @@
 
 /* ------------------------ Pistol Gun Lab ------------------------*/
 
-/* M9k USP */
-local COMBI = {}
- 
-COMBI.Name = "USP Pistol"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Tech Gunslide"] = 1
-COMBI.Req["Tech Gungrip"] = 1
-COMBI.Req["Tech Gunbarrel"] = 1
-COMBI.Req["Tech Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 16
-COMBI.SkillReq["Hunting"] = 12
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_usp"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
-
-/* M9k Luger */
-local COMBI = {}
- 
-COMBI.Name = "Luger"
-COMBI.Description = "A refined version of a pistol, Also German made!"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Tech Gunslide"] = 1
-COMBI.Req["Tech Gungrip"] = 1
-COMBI.Req["Tech Gunbarrel"] = 1
-COMBI.Req["Tech Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 17
-COMBI.SkillReq["Hunting"] = 13
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_luger"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
-/* M9k Colt1911 */
-local COMBI = {}
- 
-COMBI.Name = "Colt Pistol"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Tech Gunslide"] = 1
-COMBI.Req["Tech Gungrip"] = 1
-COMBI.Req["Tech Gunbarrel"] = 1
-COMBI.Req["Tech Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 16
-COMBI.SkillReq["Hunting"] = 12
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_colt1911"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
- 
-/* M9k Glock */
-local COMBI = {}
- 
-COMBI.Name = "Glock Pistol"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Tech Gunslide"] = 1
-COMBI.Req["Tech Gungrip"] = 1
-COMBI.Req["Tech Gunbarrel"] = 1
-COMBI.Req["Tech Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 20
-COMBI.SkillReq["Hunting"] = 16
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_glock"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
- 
-/* M9k Remington 1858 */
-local COMBI = {}
- 
-COMBI.Name = "Remington 1858"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Silver Gunslide"] = 1
-COMBI.Req["Silver Gungrip"] = 1
-COMBI.Req["Silver Gunbarrel"] = 1
-COMBI.Req["Silver Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 25
-COMBI.SkillReq["Hunting"] = 20
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_remington1858"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
-/* M9k S W Model 3 Russian */
-local COMBI = {}
- 
-COMBI.Name = "S W Model 3 Russian"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
-
-COMBI.Req = {} 
-COMBI.Req["Silver Gunslide"] = 1
-COMBI.Req["Silver Gungrip"] = 1
-COMBI.Req["Silver Gunbarrel"] = 1
-COMBI.Req["Silver Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 20
-COMBI.SkillReq["Hunting"] = 17
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_model3russian"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
- 
-/* M9k Satan */
-local COMBI = {}
- 
-COMBI.Name = "Satan Revolver"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {} 
-COMBI.Req["Silver Gunslide"] = 1
-COMBI.Req["Silver Gungrip"] = 1
-COMBI.Req["Silver Gunbarrel"] = 1
-COMBI.Req["Silver Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 30
-COMBI.SkillReq["Hunting"] = 25
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_m29satan"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
- 
-/* M9k Deagle */
-local COMBI = {}
- 
-COMBI.Name = "Deagle"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Gold Gunslide"] = 1
-COMBI.Req["Gold Gungrip"] = 1
-COMBI.Req["Gold Gunbarrel"] = 1
-COMBI.Req["Gold Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 35
-COMBI.SkillReq["Hunting"] = 28
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_deagle"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
- 
-/* M9k Raging Bull */
-local COMBI = {}
- 
-COMBI.Name = "Raging Bull"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Steel Gunslide"] = 1
-COMBI.Req["Steel Gungrip"] = 1
-COMBI.Req["Steel Gunbarrel"] = 1
-COMBI.Req["Steel Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 40
-COMBI.SkillReq["Hunting"] = 32
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_ragingbull"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
- 
-/* M9k Scoped Raging Bull */
-local COMBI = {}
- 
-COMBI.Name = "Scoped Raging Bull"
-COMBI.Description = "A refined version of a pistol"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Platinum Gunslide"] = 1
-COMBI.Req["Platinum Gungrip"] = 1
-COMBI.Req["PLatinum Gunbarrel"] = 1
-COMBI.Req["Platinum Gunmagazine"] = 1
-COMBI.Req["Platinum Weapon Scope"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 50
-COMBI.SkillReq["Hunting"] = 32
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_scoped_taurus"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+//Moved to craftablesystem/gunlabs/pistolgunlab
 
 /* ------------------------ SMG Gun Lab ------------------------*/
 
-/* M9k P90 */
-local COMBI = {}
- 
-COMBI.Name = "P90"
-COMBI.Description = "A refined version of an SMG"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Tech Gunslide"] = 1
-COMBI.Req["Tech Gungrip"] = 1
-COMBI.Req["Tech Gunbarrel"] = 1
-COMBI.Req["Tech Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 25
-COMBI.SkillReq["Hunting"] = 20
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_smgp90"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
-/* M9k Magdul PDR */
-local COMBI = {}
- 
-COMBI.Name = "Magdul PDR"
-COMBI.Description = "A refined version of an SMG"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Silver Gunslide"] = 1
-COMBI.Req["Silver Gungrip"] = 1
-COMBI.Req["Silver Gunbarrel"] = 1
-COMBI.Req["Silver Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 35
-COMBI.SkillReq["Hunting"] = 30
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_magpulpdr"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
- 
- 
-/* M9k MP90 */
-local COMBI = {}
- 
-COMBI.Name = "MP90"
-COMBI.Description = "A refined version of an SMG"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Gold Gunslide"] = 1
-COMBI.Req["Gold Gungrip"] = 1
-COMBI.Req["Gold Gunbarrel"] = 1
-COMBI.Req["Gold Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 45
-COMBI.SkillReq["Hunting"] = 40
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_mp9"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
- /*FN FAL*/
-local COMBI = {}
- 
-COMBI.Name = "FN FAL"
-COMBI.Description = "Fairly advanced Assault rifle, Pressing E and R at the same time will turn the gun between Automatic and Single shot."
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Steel Gunslide"] = 1
-COMBI.Req["Steel Gungrip"] = 1
-COMBI.Req["Steel Gunbarrel"] = 1
-COMBI.Req["Steel Gunmagazine"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 60
-COMBI.SkillReq["Hunting"] = 50
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_fal"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
-/* M9k KRISS Vector */
-local COMBI = {}
- 
-COMBI.Name = "KRISS Vector"
-COMBI.Description = "A refined version of an SMG"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Steel Gunslide"] = 1
-COMBI.Req["Steel Gungrip"] = 1
-COMBI.Req["Steel Gunbarrel"] = 1
-COMBI.Req["Steel Gunmagazine"] = 1
-COMBI.Req["Steel Reflex Scope"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 50
-COMBI.SkillReq["Hunting"] = 45
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_vector"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
-/* M9k MP7  */
-local COMBI = {}
- 
-COMBI.Name = "MP7"
-COMBI.Description = "A refined version of an SMG"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Steel Gunslide"] = 1
-COMBI.Req["Steel Gungrip"] = 1
-COMBI.Req["Steel Gunbarrel"] = 1
-COMBI.Req["Steel Gunmagazine"] = 1
-COMBI.Req["Steel Weapon Scope"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 60
-COMBI.SkillReq["Hunting"] = 50
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_mp7"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
-/* M9k Honey Badger  */
-local COMBI = {}
- 
-COMBI.Name = "Honey Badger"
-COMBI.Description = "A refined version of an SMG"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Platinum Gunslide"] = 1
-COMBI.Req["Platinum Gungrip"] = 1
-COMBI.Req["Platinum Gunbarrel"] = 1
-COMBI.Req["Platinum Gunmagazine"] = 1
-COMBI.Req["Platinum Weapon Scope"] = 1
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 70
-COMBI.SkillReq["Hunting"] = 60
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_honeybadger"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+//Moved to craftablesystem/gunlabs/smggunlab.lua
 
 /* ------------------------ High Tech Gun Lab ------------------------*/
 
-/* M9k Winchester  */
-local COMBI = {}
- 
-COMBI.Name = "Winchester Rifle"
-COMBI.Description = "A refined version of an Assault Rifle"
-COMBI.Entity = "gms_hightechgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Platinum Gunslide"] = 1
-COMBI.Req["Platinum Gungrip"] = 1
-COMBI.Req["Platinum Gunbarrel"] = 1
-COMBI.Req["Platinum Gunmagazine"] = 1
-COMBI.Req["Platinum Weapon Scope"] = 1
-COMBI.Req["Steel"] = 100
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 90
-COMBI.SkillReq["Hunting"] = 70
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_winchester73"
- 
-GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
- 
- 
-/* M9k Vikhr  */
-local COMBI = {}
- 
-COMBI.Name = "Vikhr Rifle"
-COMBI.Description = "A refined version of an Assault Rifle"
-COMBI.Entity = "gms_hightechgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Platinum Gunslide"] = 1
-COMBI.Req["Platinum Gungrip"] = 1
-COMBI.Req["Platinum Gunbarrel"] = 1
-COMBI.Req["Platinum Gunmagazine"] = 1
-COMBI.Req["Platinum Weapon Scope"] = 1
-COMBI.Req["Steel"] = 100
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 100
-COMBI.SkillReq["Hunting"] = 70
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_vikhr"
- 
-GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
- 
- 
-/* M9k Remington Sniper  */
-local COMBI = {}
- 
-COMBI.Name = "Remington Sniper"
-COMBI.Description = "A refined version of a Sniper Rifle"
-COMBI.Entity = "gms_hightechgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Platinum Gunslide"] = 1
-COMBI.Req["Platinum Gungrip"] = 1
-COMBI.Req["Platinum Gunbarrel"] = 1
-COMBI.Req["Platinum Gunmagazine"] = 1
-COMBI.Req["Platinum Weapon Scope"] = 1
-COMBI.Req["Platinum"] = 150
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 150
-COMBI.SkillReq["Hunting"] = 70
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_remington7615p"
- 
-GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
- 
- 
-/* M9k SVT Sniper  */
-local COMBI = {}
- 
-COMBI.Name = "SVT Sniper"
-COMBI.Description = "A refined version of a Sniper Rifle"
-COMBI.Entity = "gms_hightechgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Platinum Gunslide"] = 1
-COMBI.Req["Platinum Gungrip"] = 1
-COMBI.Req["Platinum Gunbarrel"] = 1
-COMBI.Req["Platinum Gunmagazine"] = 1
-COMBI.Req["Platinum Weapon Scope"] = 1
-COMBI.Req["Platinum"] = 200
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 180
-COMBI.SkillReq["Hunting"] = 100
- 
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "m9k_svt40"
- 
-GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
+//Moved to craftablesystem/gunlabs/hightechlab.lua
 
 /* ------------------------ Ammo ------------------------*/
 
-/* Pistol ammo */
-local COMBI = {}
- 
-COMBI.Name = "Pistol ammo"
-COMBI.Description = "If you wanna keep using the pistol, you'll need this"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 25
-COMBI.Req["Gunpowder"] = 15
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 10
- 
-COMBI.Texture = "gms_icons/item_ammo_pistol.png"
-COMBI.SwepClass = "item_ammo_pistol_large"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
-
-/* Crossbow Bolts */
-local COMBI = {}
- 
-COMBI.Name = "Crossbow Bolts"
-COMBI.Description = "If you wanna keep using your Crossbow, you'll need this"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 50
-COMBI.Req["Stone"] = 25
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 50
- 
-COMBI.Texture = "gms_icons/item_ammo_pistol.png"
-COMBI.SwepClass = "item_ammo_crossbow "
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
-/* Smg ammo */
-local COMBI = {}
- 
-COMBI.Name = "SMG Ammo"
-COMBI.Description = "If you wanna keep using the smg, you'll need this"
-COMBI.Entity = "gms_smggunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 50
-COMBI.Req["Gunpowder"] = 25
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 15
- 
-COMBI.Texture = "gms_icons/item_ammo_smg1.png"
-COMBI.SwepClass = "item_ammo_smg1_large"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
- 
-/* Revolver Ammo */
-local COMBI = {}
- 
-COMBI.Name = "Revolver Ammo"
-COMBI.Description = "If you wanna keep using the revolvers, you'll need this"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 50
-COMBI.Req["Gunpowder"] = 25
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 10
- 
-COMBI.Texture = "gms_icons/item_ammo_pistol.png"
-COMBI.SwepClass = "item_ammo_357_large"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
- 
-/* Assault Rifle Ammo */
-local COMBI = {}
- 
-COMBI.Name = "Assault Rifle Ammo"
-COMBI.Description = "If you wanna keep using your Assault Rifle weapons you'll need this"
-COMBI.Entity = "gms_cedargunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 10
-COMBI.Req["Gunpowder"] = 5
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 50
- 
-COMBI.Texture = "gms_icons/item_ammo_smg1.png"
-COMBI.SwepClass = "item_ammo_ar2_large"
- 
-GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+//Pistol, HL2 shotgun, crossbolt and revolver ammo moved to craftablesystem/gunlabs/pistolgunlab
 
-/* Winchester Ammo */
-local COMBI = {}
- 
-COMBI.Name = "Winchester Ammo"
-COMBI.Description = "If you wanna keep using your Winchester you'll need this"
-COMBI.Entity = "gms_hightechgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 10
-COMBI.Req["Gunpowder"] = 5
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 50
- 
-COMBI.Texture = "gms_icons/item_ammo_smg1.png"
-COMBI.SwepClass = "m9k_ammo_winchester"
- 
-GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
+//SMG and assult rifle ammo moved to craftablesystem/gunlabs/smggunlab.lua
 
-/* Shotgun Ammo (HL2) */
-local COMBI = {}
- 
-COMBI.Name = "Shotgun Ammo"
-COMBI.Description = "If you want to keep using your Shotgun weapons you'll need this"
-COMBI.Entity = "gms_pistolgunlab"
- 
-COMBI.Req = {}
-COMBI.Req["Iron"] = 5
-COMBI.Req["Gunpowder"] = 5
- 
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 25
- 
-COMBI.Texture = "gms_icons/item_ammo_smg1.png"
-COMBI.SwepClass = "item_box_buckshot"
- 
-GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+//Winchester ammo moved to craftablesystem/gunlabs/hightechlab.lua
 
 /* ------------------------------------------------------------------------Platinum workbench------------------------------------------------------------------------ */
-local COMBI = {}
-
-COMBI.Name = "Pickaxe of Djarex"
-COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
-COMBI.Entity = "gms_platinumworkbench"
-
-COMBI.Req = {}
-COMBI.Req["Platinum"] = 25
-COMBI.Req ["Steel"] = 25
-COMBI.Req ["Gold"] = 25
-COMBI.Req["Elm"] = 50
-COMBI.Req["Mahogany"] = 50
-
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 50
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_pickaxeofdjarex"
-
-GMS.RegisterCombi( COMBI, "gms_platinumworkbench" )
+//Pickaxe of Djarex moved to craftablesystem/workbench/platinumworkbench.lua
 -------------------------------------------------------------Platinum Furnace------------------------------------
-local COMBI = {}
-
-COMBI.Name = "Pure Mithril"
-COMBI.Description = "The purest form of mithril able to be made"
-COMBI.Entity = "gms_platinumfurnace"
-
-COMBI.Req = {}
-COMBI.Req["Mithril_Ore"] = 2
-
-COMBI.Results = {}
-COMBI.Results["Pure_Mithril"] = 1
-
-GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" )
-
-local COMBI = {}
-
-COMBI.Name = "Pure Mithril x5"
-COMBI.Description = "The purest form of mithril able to be made"
-COMBI.Entity = "gms_platinumfurnace"
-
-COMBI.Req = {}
-COMBI.Req["Mithril_Ore"] = 10
-
-COMBI.Results = {}
-COMBI.Results["Pure_Mithril"] = 5
-
-GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" )
-
-local COMBI = {}
-
-COMBI.Name = "Pure Mithril x10"
-COMBI.Description = "The purest form of mithril able to be made"
-COMBI.Entity = "gms_platinumfurnace"
-
-COMBI.Req = {}
-COMBI.Req["Mithril_Ore"] = 20
-
-COMBI.Results = {}
-COMBI.Results["Pure_Mithril"] = 10
-
-GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" )
-
-local COMBI = {}
-
-COMBI.Name = "All Pure Mithril"
-COMBI.Description = "Pure Mithril can be used to start of you industrial needs"
-COMBI.Entity = "gms_platinumfurnace"
-
-COMBI.Req = {}
-COMBI.Req["Mithril_Ore"] = 2
-
-COMBI.Results = {}
-COMBI.Results["Pure_Mithril"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_platinumfurnace" )
 
+//Moved to craftablesystem/furnaces/platinumfurnace.lua
 
 ----------------------------------------------------------------------Steel Workbench-----------------------------------------------
-local COMBI = {}
-
-COMBI.Name = "Bucket"
-COMBI.Description = "a simple bucket for simple needs"
-COMBI.Entity = "gms_steelworkbench"
-
-COMBI.Req = {}
-COMBI.Req["Steel"] = 30
-COMBI.Req["Wood"] = 5
-
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 30
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_bucket"
-
-GMS.RegisterCombi ( COMBI, "gms_steelworkbench")
 
+//Moved to craftablesystem/workbenches/steelworkbench.lua
 
 ---------------------------------------------------------------------------Obelisk----------------------------------
-/*Obelisk*/
-local COMBI = {}
-
-COMBI.Name = "Obelisk"
-COMBI.Description = "A broken down obelisk used to make basic runes"
-
-COMBI.Req = {}
-COMBI.Req["Strange_Stone"] = 50
-
-COMBI.Results = "gms_obelisk"
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.BuildSiteModel = "models/props_c17/gravestone_cross001b.mdl"
-
-GMS.RegisterCombi( COMBI, "Structures" )
-
-
-local COMBI = {}
-
-COMBI.Name = "Basic Rune"
-COMBI.Description = "the most basic rune used for inscribing"
-COMBI.Entity = "gms_obelisk"
-
-COMBI.Req = {}
-COMBI.Req["Strange_Stone"] = 5
-
-COMBI.Results = {}
-COMBI.Results["Basic_Rune"] = 1
-
-GMS.RegisterCombi ( COMBI, "gms_obelisk")
-
-local COMBI = {}
-
-COMBI.Name = "Chisel"
-COMBI.Description = "Effective in cutting stone"
-COMBI.Entity = "gms_obelisk" 
-
-COMBI.Req = {}
-COMBI.Req["Iron"] = 30
-COMBI.Req["Wood"] = 5
-COMBI.Req["Strange_Stone"] = 5
-
-COMBI.SkillReq = {}
-COMBI.SkillReq["Weapon_Crafting"] = 40
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_chisel"
-
-GMS.RegisterCombi ( COMBI, "gms_obelisk")
-
 
+//Moved to craftablesystem/misc/obelisk.lua
 
 ----------------------------------------------------------Mithril Factory-----------------------------------------------
-/*Mithril Factory*/
-local COMBI = {}
-
-COMBI.Name = "Mithril Factory"
-COMBI.Description = "A advanced factor for faster smelting"
-
-COMBI.Req = {}
-COMBI.Req["Pure_Mithril"] = 400
-COMBI.Req["Teak"] = 50
-
-COMBI.Results = "gms_mithrilfactory"
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.BuildSiteModel = "models/props_wasteland/laundry_washer001a.mdl"
-
-GMS.RegisterCombi( COMBI, "Structures" )
-
-/* Allsmelt Copper */
-local COMBI = {}
-
-COMBI.Name = "All Copper"
-COMBI.Description = "Copper can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Copper_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Copper"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
-
-/* Allsmelt Iron  */
-local COMBI = {}
-
-COMBI.Name = "All Iron"
-COMBI.Description = "Iron can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Iron_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Iron"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
-
-/* Allsmelt Tech */
-local COMBI = {}
-
-COMBI.Name = " All Tech "
-COMBI.Description = "Tech can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Tech_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Tech"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
-
-/* All Silver */
-local COMBI = {}
-
-COMBI.Name = "All Silver"
-COMBI.Description = "Silver can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Silver_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Silver"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi ( COMBI, "gms_mithrilfactory" )
-
-/* All Gold */
-local COMBI = {}
-
-COMBI.Name = "All Gold"
-COMBI.Description = "Gold can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Gold_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Gold"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
-
-/* All Steel */
-local COMBI = {}
-
-COMBI.Name = "All Steel"
-COMBI.Description = "Steel can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Steel_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Steel"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
 
-/* All Platinum */
-local COMBI = {}
-
-COMBI.Name = "All Platinum"
-COMBI.Description = "Platinum can be used to create more advanced buildings and tools."
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Platinum_Ore"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Platinum"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
-
-/* All Pure Mithrill */
-local COMBI = {}
-
-COMBI.Name = "Pure_Mithril"
-COMBI.Description = "Pure Mithril can be used to start of you industrial needs"
-COMBI.Entity = "gms_mithrilfactory"
-
-COMBI.Req = {}
-COMBI.Req["Mithril_Ore"] = 2
-
-COMBI.Results = {}
-COMBI.Results["Pure_Mithril"] = 1
-
-COMBI.AllSmelt = true
-COMBI.Max = 50
-
-GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+//Moved to craftablesystem/misc/mithfactory.lua
 
 ------------------------------------------------------------Mythril Workbench-----------------------------------------------
 
-local COMBI = {}
-
-COMBI.Name = "Mithril WorkBench"
-COMBI.Description = "A very basic industrial crafting station"
-
-COMBI.Req = {}
-COMBI.Req["Pure_Mithril"] = 200
-COMBI.Req["Teak"] = 20
-
-COMBI.Results = "gms_mithrilworkbench"
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.BuildSiteModel = "models/props_wasteland/kitchen_counter001c.mdl"
-
-GMS.RegisterCombi( COMBI, "Structures" )
-
-local COMBI = {}
-
-COMBI.Name = "Mithril Pickaxe"
-COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
-COMBI.Entity = "gms_mithrilworkbench"
-
-COMBI.Req = {}
-COMBI.Req["Pure_Mithril"] = 50
-COMBI.Req["Teak"] = 25
-
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_mithrilpickaxe"
-
-GMS.RegisterCombi( COMBI, "gms_mithrilworkbench" )
+//Moved to craftablesystem/workbenches/mythrilworkbench.lua
 
 ------------------------------------------------Rune Altar--------------------------------------
-local COMBI = {}
-
-COMBI.Name = "Rune Altar"
-COMBI.Description = "A basic Altar used for making runes"
-
-COMBI.Req = {}
-COMBI.Req["Strange_Stone"] = 100
-COMBI.Req["Stone"] = 500
-COMBI.Req["Basic_Rune"] = 10
 
-COMBI.Results = "gms_runealtar"
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.BuildSiteModel = "models/xqm/rails/cap.mdl"
+//Moved to craftablesystem/misc/runealter.lua
 
-GMS.RegisterCombi( COMBI, "Structures" )
- 
- local COMBI = {}
- 
-COMBI.Name = "Fire Rune"
-COMBI.Description = "A rune infused with the element of fire"
-COMBI.Entity = "gms_runealtar"
-
-COMBI.Req = {}
-COMBI.Req["Basic_Rune"] = 1
-COMBI.Req["Charcoal"] = 10
-COMBI.Req["Strange_Stone"] = 20
-
-COMBI.Results = {}
-COMBI.Results["Fire_Rune"] = 1
-
-
-GMS.RegisterCombi( COMBI, "gms_runealtar" )
-
-local COMBI = {}
-
-COMBI.Name = "Water Rune"
-COMBI.Description = "A rune infused with the element of water"
-COMBI.Entity = "gms_runealtar"
-
-COMBI.Req = {}
-COMBI.Req["Basic_Rune"] = 1
-COMBI.Req["Water_Bottles"] = 10
-COMBI.Req["Strange_Stone"] = 20
-
-COMBI.Results = {}
-COMBI.Results["Water_Rune"] = 1
-
-
-GMS.RegisterCombi( COMBI, "gms_runealtar" )
-
-local COMBI = {}
-
-COMBI.Name = "Air Rune"
-COMBI.Description = "A rune infused with the element of air"
-COMBI.Entity = "gms_runealtar"
-
-COMBI.Req = {}
-COMBI.Req["Basic_Rune"] = 1
-COMBI.Req["Dust"] = 10
-COMBI.Req["Strange_Stone"] = 20
-
-COMBI.Results = {}
-COMBI.Results["Air_Rune"] = 1
-
-
-GMS.RegisterCombi( COMBI, "gms_runealtar" )
-
-local COMBI = {}
-
-COMBI.Name = "Earth Rune"
-COMBI.Description = "A rune infused with the element of earth"
-COMBI.Entity = "gms_runealtar"
-
-COMBI.Req = {}
-COMBI.Req["Basic_Rune"] = 1
-COMBI.Req["Wood"] = 10
-COMBI.Req["Strange_Stone"] = 20
-
-COMBI.Results = {}
-COMBI.Results["Earth_Rune"] = 1
-
-GMS.RegisterCombi( COMBI, "gms_runealtar" )
 ---------------------------------------------------Runic Infuser-----------------------------------
-local COMBI = {}
-
-COMBI.Name = "Runic Infuser"
-COMBI.Description = "A basic place for infusing tools"
 
-COMBI.Req = {}
-COMBI.Req["Strange_Stone"] = 200
-COMBI.Req["Stone"] = 200
-COMBI.Req["Basic_Rune"] = 20
-
-COMBI.Results = "gms_runicinfuser"
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.BuildSiteModel = "models/maxofs2d/hover_rings.mdl"
-
-GMS.RegisterCombi( COMBI, "Structures" )
-
-local COMBI = {}
-
-COMBI.Name = "Pickaxe Head"
-COMBI.Description = "it might be dull but it gets the job done"
-COMBI.Entity = "gms_runicinfuser"
-
-COMBI.Req = {}
-COMBI.Req["Stone"] = 150
-COMBI.Req["Strange_Stone"] = 20
-
-COMBI.Results = {}
-COMBI.Results["Pickaxe_Head"] = 1
-
-GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
-
-local COMBI = {}
-
-COMBI.Name = "Pickaxe Handle"
-COMBI.Description = "a sturdy handle for a sturdy tool"
-COMBI.Entity = "gms_runicinfuser"
-
-COMBI.Req = {}
-COMBI.Req["Stone"] = 100
-COMBI.Req["Strange_Stone"] = 15
-
-COMBI.Results = {}
-COMBI.Results["Pickaxe_Handle"] = 1
-
-GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
-
-local COMBI = {}
-
-COMBI.Name = "Air Rune Pickaxe"
-COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
-COMBI.Entity = "gms_runicinfuser"
-
-COMBI.Req = {}
-COMBI.Req["Pickaxe_Head"] = 1
-COMBI.Req["Pickaxe_Handle"] = 1
-COMBI.Req["Air_Rune"] = 3
-COMBI.Req["Strange_Stone"] = 15
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_runeapickaxe"
-
-GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
-
-local COMBI = {}
-
-COMBI.Name = "Earth Rune Pickaxe"
-COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
-COMBI.Entity = "gms_runicinfuser"
-
-COMBI.Req = {}
-COMBI.Req["Pickaxe_Head"] = 1
-COMBI.Req["Pickaxe_Handle"] = 1
-COMBI.Req["Earth_Rune"] = 3
-COMBI.Req["Strange_Stone"] = 15
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_runeepickaxe"
-
-GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
-
-local COMBI = {}
-
-COMBI.Name = "Fire Rune Pickaxe"
-COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
-COMBI.Entity = "gms_runicinfuser"
-
-COMBI.Req = {}
-COMBI.Req["Pickaxe_Head"] = 1
-COMBI.Req["Pickaxe_Handle"] = 1
-COMBI.Req["Fire_Rune"] = 3 
-COMBI.Req["Strange_Stone"] = 15
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_runefpickaxe"
-
-GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
-
-local COMBI = {}
-
-COMBI.Name = "Water Rune Pickaxe"
-COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
-COMBI.Entity = "gms_runicinfuser"
-
-COMBI.Req = {}
-COMBI.Req["Pickaxe_Head"] = 1
-COMBI.Req["Pickaxe_Handle"] = 1
-COMBI.Req["Water_Rune"] = 3 
-COMBI.Req["Strange_Stone"] = 15
-
-COMBI.Texture = "gms_icons/gms_weapon.png"
-COMBI.SwepClass = "gms_runewpickaxe"
-
-GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
+//Moved to craftablesystem/misc/runeinfuser.lua
 
 ---------------------------------Grinding Stone--------------------
-local COMBI = {}
-
-COMBI.Name = "Dust x5"
-COMBI.Description = "A fine powder that floats through the wind"
-COMBI.Entity = "gms_grindingstone"
-
-COMBI.Req = {}
-COMBI.Req["Sand"] = 1
-
-COMBI.Results = {}
-COMBI.Results["Dust"] = 5
-
-GMS.RegisterCombi( COMBI, "gms_grindingstone" )
-
-
-
-
-
-
-
-
 
+//Moved to craftablesystem/misc/grindingstone.lua
diff --git a/gamemode/craftablesystem/furnaces/platinumfurnace.lua b/gamemode/craftablesystem/furnaces/platinumfurnace.lua
index 6f7bbd5..eb1147d 100644
--- a/gamemode/craftablesystem/furnaces/platinumfurnace.lua
+++ b/gamemode/craftablesystem/furnaces/platinumfurnace.lua
@@ -13,3 +13,62 @@ COMBI.Texture = "gms_icons/gms_none.png"
 COMBI.BuildSiteModel = "models/xeon133/slider/slider_stand_12x12x24.mdl"
 
 GMS.RegisterCombi( COMBI, "Structures" )
+
+local COMBI = {}
+
+COMBI.Name = "Pure Mithril"
+COMBI.Description = "The purest form of mithril able to be made"
+COMBI.Entity = "gms_platinumfurnace"
+
+COMBI.Req = {}
+COMBI.Req["Mithril_Ore"] = 2
+
+COMBI.Results = {}
+COMBI.Results["Pure_Mithril"] = 1
+
+GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" )
+
+local COMBI = {}
+
+COMBI.Name = "Pure Mithril x5"
+COMBI.Description = "The purest form of mithril able to be made"
+COMBI.Entity = "gms_platinumfurnace"
+
+COMBI.Req = {}
+COMBI.Req["Mithril_Ore"] = 10
+
+COMBI.Results = {}
+COMBI.Results["Pure_Mithril"] = 5
+
+GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" )
+
+local COMBI = {}
+
+COMBI.Name = "Pure Mithril x10"
+COMBI.Description = "The purest form of mithril able to be made"
+COMBI.Entity = "gms_platinumfurnace"
+
+COMBI.Req = {}
+COMBI.Req["Mithril_Ore"] = 20
+
+COMBI.Results = {}
+COMBI.Results["Pure_Mithril"] = 10
+
+GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" )
+
+local COMBI = {}
+
+COMBI.Name = "All Pure Mithril"
+COMBI.Description = "Pure Mithril can be used to start of you industrial needs"
+COMBI.Entity = "gms_platinumfurnace"
+
+COMBI.Req = {}
+COMBI.Req["Mithril_Ore"] = 2
+
+COMBI.Results = {}
+COMBI.Results["Pure_Mithril"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_platinumfurnace" )
diff --git a/gamemode/craftablesystem/gunlabs/hightechlab.lua b/gamemode/craftablesystem/gunlabs/hightechlab.lua
index 3428d82..212f065 100644
--- a/gamemode/craftablesystem/gunlabs/hightechlab.lua
+++ b/gamemode/craftablesystem/gunlabs/hightechlab.lua
@@ -14,3 +14,121 @@ COMBI.Texture = "gms_icons/gms_none.png"
 COMBI.BuildSiteModel = "models/props_wasteland/laundry_washer003.mdl"
 
 GMS.RegisterCombi( COMBI, "Structures" )
+
+/* M9k Winchester  */
+local COMBI = {}
+
+COMBI.Name = "Winchester Rifle"
+COMBI.Description = "A refined version of an Assault Rifle"
+COMBI.Entity = "gms_hightechgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Platinum Gunslide"] = 1
+COMBI.Req["Platinum Gungrip"] = 1
+COMBI.Req["Platinum Gunbarrel"] = 1
+COMBI.Req["Platinum Gunmagazine"] = 1
+COMBI.Req["Platinum Weapon Scope"] = 1
+COMBI.Req["Steel"] = 100
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 90
+COMBI.SkillReq["Hunting"] = 70
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_winchester73"
+
+GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
+
+
+/* M9k Vikhr  */
+local COMBI = {}
+
+COMBI.Name = "Vikhr Rifle"
+COMBI.Description = "A refined version of an Assault Rifle"
+COMBI.Entity = "gms_hightechgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Platinum Gunslide"] = 1
+COMBI.Req["Platinum Gungrip"] = 1
+COMBI.Req["Platinum Gunbarrel"] = 1
+COMBI.Req["Platinum Gunmagazine"] = 1
+COMBI.Req["Platinum Weapon Scope"] = 1
+COMBI.Req["Steel"] = 100
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 100
+COMBI.SkillReq["Hunting"] = 70
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_vikhr"
+
+GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
+
+
+/* M9k Remington Sniper  */
+local COMBI = {}
+
+COMBI.Name = "Remington Sniper"
+COMBI.Description = "A refined version of a Sniper Rifle"
+COMBI.Entity = "gms_hightechgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Platinum Gunslide"] = 1
+COMBI.Req["Platinum Gungrip"] = 1
+COMBI.Req["Platinum Gunbarrel"] = 1
+COMBI.Req["Platinum Gunmagazine"] = 1
+COMBI.Req["Platinum Weapon Scope"] = 1
+COMBI.Req["Platinum"] = 150
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 150
+COMBI.SkillReq["Hunting"] = 70
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_remington7615p"
+
+GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
+
+
+/* M9k SVT Sniper  */
+local COMBI = {}
+
+COMBI.Name = "SVT Sniper"
+COMBI.Description = "A refined version of a Sniper Rifle"
+COMBI.Entity = "gms_hightechgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Platinum Gunslide"] = 1
+COMBI.Req["Platinum Gungrip"] = 1
+COMBI.Req["Platinum Gunbarrel"] = 1
+COMBI.Req["Platinum Gunmagazine"] = 1
+COMBI.Req["Platinum Weapon Scope"] = 1
+COMBI.Req["Platinum"] = 200
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 180
+COMBI.SkillReq["Hunting"] = 100
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_svt40"
+
+GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
+
+/* Winchester Ammo */
+local COMBI = {}
+
+COMBI.Name = "Winchester Ammo"
+COMBI.Description = "If you wanna keep using your Winchester you'll need this"
+COMBI.Entity = "gms_hightechgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 10
+COMBI.Req["Gunpowder"] = 5
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 50
+
+COMBI.Texture = "gms_icons/item_ammo_smg1.png"
+COMBI.SwepClass = "m9k_ammo_winchester"
+
+GMS.RegisterCombi( COMBI, "gms_hightechgunlab" )
diff --git a/gamemode/craftablesystem/gunlabs/pistolgunlab.lua b/gamemode/craftablesystem/gunlabs/pistolgunlab.lua
index 107be1b..be79a1e 100644
--- a/gamemode/craftablesystem/gunlabs/pistolgunlab.lua
+++ b/gamemode/craftablesystem/gunlabs/pistolgunlab.lua
@@ -79,3 +79,308 @@ COMBI.Texture = "gms_icons/gms_weapon.png"
 COMBI.SwepClass = "weapon_crossbow"
 
 GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* ------------------------ Pistol Gun Lab ------------------------*/
+
+/* M9k USP */
+local COMBI = {}
+
+COMBI.Name = "USP Pistol"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Tech Gunslide"] = 1
+COMBI.Req["Tech Gungrip"] = 1
+COMBI.Req["Tech Gunbarrel"] = 1
+COMBI.Req["Tech Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 16
+COMBI.SkillReq["Hunting"] = 12
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_usp"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* M9k Luger */
+local COMBI = {}
+
+COMBI.Name = "Luger"
+COMBI.Description = "A refined version of a pistol, Also German made!"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Tech Gunslide"] = 1
+COMBI.Req["Tech Gungrip"] = 1
+COMBI.Req["Tech Gunbarrel"] = 1
+COMBI.Req["Tech Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 17
+COMBI.SkillReq["Hunting"] = 13
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_luger"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* M9k Colt1911 */
+local COMBI = {}
+
+COMBI.Name = "Colt Pistol"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Tech Gunslide"] = 1
+COMBI.Req["Tech Gungrip"] = 1
+COMBI.Req["Tech Gunbarrel"] = 1
+COMBI.Req["Tech Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 16
+COMBI.SkillReq["Hunting"] = 12
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_colt1911"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+
+/* M9k Glock */
+local COMBI = {}
+
+COMBI.Name = "Glock Pistol"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Tech Gunslide"] = 1
+COMBI.Req["Tech Gungrip"] = 1
+COMBI.Req["Tech Gunbarrel"] = 1
+COMBI.Req["Tech Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 20
+COMBI.SkillReq["Hunting"] = 16
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_glock"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+
+/* M9k Remington 1858 */
+local COMBI = {}
+
+COMBI.Name = "Remington 1858"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Silver Gunslide"] = 1
+COMBI.Req["Silver Gungrip"] = 1
+COMBI.Req["Silver Gunbarrel"] = 1
+COMBI.Req["Silver Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 25
+COMBI.SkillReq["Hunting"] = 20
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_remington1858"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* M9k S W Model 3 Russian */
+local COMBI = {}
+
+COMBI.Name = "S W Model 3 Russian"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Silver Gunslide"] = 1
+COMBI.Req["Silver Gungrip"] = 1
+COMBI.Req["Silver Gunbarrel"] = 1
+COMBI.Req["Silver Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 20
+COMBI.SkillReq["Hunting"] = 17
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_model3russian"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+
+/* M9k Satan */
+local COMBI = {}
+
+COMBI.Name = "Satan Revolver"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Silver Gunslide"] = 1
+COMBI.Req["Silver Gungrip"] = 1
+COMBI.Req["Silver Gunbarrel"] = 1
+COMBI.Req["Silver Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 30
+COMBI.SkillReq["Hunting"] = 25
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_m29satan"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+
+/* M9k Deagle */
+local COMBI = {}
+
+COMBI.Name = "Deagle"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Gold Gunslide"] = 1
+COMBI.Req["Gold Gungrip"] = 1
+COMBI.Req["Gold Gunbarrel"] = 1
+COMBI.Req["Gold Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 35
+COMBI.SkillReq["Hunting"] = 28
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_deagle"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+
+/* M9k Raging Bull */
+local COMBI = {}
+
+COMBI.Name = "Raging Bull"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Steel Gunslide"] = 1
+COMBI.Req["Steel Gungrip"] = 1
+COMBI.Req["Steel Gunbarrel"] = 1
+COMBI.Req["Steel Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 40
+COMBI.SkillReq["Hunting"] = 32
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_ragingbull"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+
+/* M9k Scoped Raging Bull */
+local COMBI = {}
+
+COMBI.Name = "Scoped Raging Bull"
+COMBI.Description = "A refined version of a pistol"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Platinum Gunslide"] = 1
+COMBI.Req["Platinum Gungrip"] = 1
+COMBI.Req["PLatinum Gunbarrel"] = 1
+COMBI.Req["Platinum Gunmagazine"] = 1
+COMBI.Req["Platinum Weapon Scope"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 50
+COMBI.SkillReq["Hunting"] = 32
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_scoped_taurus"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* Pistol ammo */
+local COMBI = {}
+
+COMBI.Name = "Pistol ammo"
+COMBI.Description = "If you wanna keep using the pistol, you'll need this"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 25
+COMBI.Req["Gunpowder"] = 15
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 10
+
+COMBI.Texture = "gms_icons/item_ammo_pistol.png"
+COMBI.SwepClass = "item_ammo_pistol_large"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* Crossbow Bolts */
+local COMBI = {}
+
+COMBI.Name = "Crossbow Bolts"
+COMBI.Description = "If you wanna keep using your Crossbow, you'll need this"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 50
+COMBI.Req["Stone"] = 25
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 50
+
+COMBI.Texture = "gms_icons/item_ammo_pistol.png"
+COMBI.SwepClass = "item_ammo_crossbow "
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* Revolver Ammo */
+local COMBI = {}
+
+COMBI.Name = "Revolver Ammo"
+COMBI.Description = "If you wanna keep using the revolvers, you'll need this"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 50
+COMBI.Req["Gunpowder"] = 25
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 10
+
+COMBI.Texture = "gms_icons/item_ammo_pistol.png"
+COMBI.SwepClass = "item_ammo_357_large"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
+
+/* Shotgun Ammo (HL2) */
+local COMBI = {}
+
+COMBI.Name = "Shotgun Ammo"
+COMBI.Description = "If you want to keep using your Shotgun weapons you'll need this"
+COMBI.Entity = "gms_pistolgunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 5
+COMBI.Req["Gunpowder"] = 5
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 25
+
+COMBI.Texture = "gms_icons/item_ammo_smg1.png"
+COMBI.SwepClass = "item_box_buckshot"
+
+GMS.RegisterCombi( COMBI, "gms_pistolgunlab" )
diff --git a/gamemode/craftablesystem/gunlabs/smggunlab.lua b/gamemode/craftablesystem/gunlabs/smggunlab.lua
index 2540b19..e7f99d4 100644
--- a/gamemode/craftablesystem/gunlabs/smggunlab.lua
+++ b/gamemode/craftablesystem/gunlabs/smggunlab.lua
@@ -35,3 +35,202 @@ COMBI.Texture = "gms_icons/weapon_smg1.png"
 COMBI.SwepClass = "weapon_smg1"
 
 GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/*---------------------------------M9K stuff------------------------------*/
+
+/* M9k P90 */
+local COMBI = {}
+
+COMBI.Name = "P90"
+COMBI.Description = "A refined version of an SMG"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Tech Gunslide"] = 1
+COMBI.Req["Tech Gungrip"] = 1
+COMBI.Req["Tech Gunbarrel"] = 1
+COMBI.Req["Tech Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 25
+COMBI.SkillReq["Hunting"] = 20
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_smgp90"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/* M9k Magdul PDR */
+local COMBI = {}
+
+COMBI.Name = "Magdul PDR"
+COMBI.Description = "A refined version of an SMG"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Silver Gunslide"] = 1
+COMBI.Req["Silver Gungrip"] = 1
+COMBI.Req["Silver Gunbarrel"] = 1
+COMBI.Req["Silver Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 35
+COMBI.SkillReq["Hunting"] = 30
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_magpulpdr"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+
+
+/* M9k MP90 */
+local COMBI = {}
+
+COMBI.Name = "MP90"
+COMBI.Description = "A refined version of an SMG"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Gold Gunslide"] = 1
+COMBI.Req["Gold Gungrip"] = 1
+COMBI.Req["Gold Gunbarrel"] = 1
+COMBI.Req["Gold Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 45
+COMBI.SkillReq["Hunting"] = 40
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_mp9"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+ /*FN FAL*/
+local COMBI = {}
+
+COMBI.Name = "FN FAL"
+COMBI.Description = "Fairly advanced Assault rifle, Pressing E and R at the same time will turn the gun between Automatic and Single shot."
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Steel Gunslide"] = 1
+COMBI.Req["Steel Gungrip"] = 1
+COMBI.Req["Steel Gunbarrel"] = 1
+COMBI.Req["Steel Gunmagazine"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 60
+COMBI.SkillReq["Hunting"] = 50
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_fal"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/* M9k KRISS Vector */
+local COMBI = {}
+
+COMBI.Name = "KRISS Vector"
+COMBI.Description = "A refined version of an SMG"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Steel Gunslide"] = 1
+COMBI.Req["Steel Gungrip"] = 1
+COMBI.Req["Steel Gunbarrel"] = 1
+COMBI.Req["Steel Gunmagazine"] = 1
+COMBI.Req["Steel Reflex Scope"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 50
+COMBI.SkillReq["Hunting"] = 45
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_vector"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/* M9k MP7  */
+local COMBI = {}
+
+COMBI.Name = "MP7"
+COMBI.Description = "A refined version of an SMG"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Steel Gunslide"] = 1
+COMBI.Req["Steel Gungrip"] = 1
+COMBI.Req["Steel Gunbarrel"] = 1
+COMBI.Req["Steel Gunmagazine"] = 1
+COMBI.Req["Steel Weapon Scope"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 60
+COMBI.SkillReq["Hunting"] = 50
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_mp7"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/* M9k Honey Badger  */
+local COMBI = {}
+
+COMBI.Name = "Honey Badger"
+COMBI.Description = "A refined version of an SMG"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Platinum Gunslide"] = 1
+COMBI.Req["Platinum Gungrip"] = 1
+COMBI.Req["Platinum Gunbarrel"] = 1
+COMBI.Req["Platinum Gunmagazine"] = 1
+COMBI.Req["Platinum Weapon Scope"] = 1
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 70
+COMBI.SkillReq["Hunting"] = 60
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "m9k_honeybadger"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/* Smg ammo */
+local COMBI = {}
+
+COMBI.Name = "SMG Ammo"
+COMBI.Description = "If you wanna keep using the smg, you'll need this"
+COMBI.Entity = "gms_smggunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 50
+COMBI.Req["Gunpowder"] = 25
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 15
+
+COMBI.Texture = "gms_icons/item_ammo_smg1.png"
+COMBI.SwepClass = "item_ammo_smg1_large"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
+
+/* Assault Rifle Ammo */
+local COMBI = {}
+
+COMBI.Name = "Assault Rifle Ammo"
+COMBI.Description = "If you wanna keep using your Assault Rifle weapons you'll need this"
+COMBI.Entity = "gms_cedargunlab"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 10
+COMBI.Req["Gunpowder"] = 5
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 50
+
+COMBI.Texture = "gms_icons/item_ammo_smg1.png"
+COMBI.SwepClass = "item_ammo_ar2_large"
+
+GMS.RegisterCombi( COMBI, "gms_smggunlab" )
diff --git a/gamemode/craftablesystem/misc/grindingstone.lua b/gamemode/craftablesystem/misc/grindingstone.lua
index d7da59e..1463d48 100644
--- a/gamemode/craftablesystem/misc/grindingstone.lua
+++ b/gamemode/craftablesystem/misc/grindingstone.lua
@@ -120,3 +120,17 @@ COMBI.AllSmelt = true
 COMBI.Max = 25
 
 GMS.RegisterCombi( COMBI, "gms_grindingstone" )
+
+local COMBI = {}
+
+COMBI.Name = "Dust x5"
+COMBI.Description = "A fine powder that floats through the wind"
+COMBI.Entity = "gms_grindingstone"
+
+COMBI.Req = {}
+COMBI.Req["Sand"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Dust"] = 5
+
+GMS.RegisterCombi( COMBI, "gms_grindingstone" )
diff --git a/gamemode/craftablesystem/misc/mythrilfactory.lua b/gamemode/craftablesystem/misc/mythrilfactory.lua
new file mode 100644
index 0000000..708e27d
--- /dev/null
+++ b/gamemode/craftablesystem/misc/mythrilfactory.lua
@@ -0,0 +1,159 @@
+/*Mithril Factory*/
+local COMBI = {}
+
+COMBI.Name = "Mithril Factory"
+COMBI.Description = "A advanced factor for faster smelting"
+
+COMBI.Req = {}
+COMBI.Req["Pure_Mithril"] = 400
+COMBI.Req["Teak"] = 50
+
+COMBI.Results = "gms_mithrilfactory"
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.BuildSiteModel = "models/props_wasteland/laundry_washer001a.mdl"
+
+GMS.RegisterCombi( COMBI, "Structures" )
+
+/* Allsmelt Copper */
+local COMBI = {}
+
+COMBI.Name = "All Copper"
+COMBI.Description = "Copper can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Copper_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Copper"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+
+/* Allsmelt Iron  */
+local COMBI = {}
+
+COMBI.Name = "All Iron"
+COMBI.Description = "Iron can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Iron_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Iron"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+
+/* Allsmelt Tech */
+local COMBI = {}
+
+COMBI.Name = " All Tech "
+COMBI.Description = "Tech can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Tech_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Tech"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+
+/* All Silver */
+local COMBI = {}
+
+COMBI.Name = "All Silver"
+COMBI.Description = "Silver can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Silver_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Silver"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi ( COMBI, "gms_mithrilfactory" )
+
+/* All Gold */
+local COMBI = {}
+
+COMBI.Name = "All Gold"
+COMBI.Description = "Gold can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Gold_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Gold"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+
+/* All Steel */
+local COMBI = {}
+
+COMBI.Name = "All Steel"
+COMBI.Description = "Steel can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Steel_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Steel"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+
+/* All Platinum */
+local COMBI = {}
+
+COMBI.Name = "All Platinum"
+COMBI.Description = "Platinum can be used to create more advanced buildings and tools."
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Platinum_Ore"] = 1
+
+COMBI.Results = {}
+COMBI.Results["Platinum"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
+
+/* All Pure Mithrill */
+local COMBI = {}
+
+COMBI.Name = "Pure_Mithril"
+COMBI.Description = "Pure Mithril can be used to start of you industrial needs"
+COMBI.Entity = "gms_mithrilfactory"
+
+COMBI.Req = {}
+COMBI.Req["Mithril_Ore"] = 2
+
+COMBI.Results = {}
+COMBI.Results["Pure_Mithril"] = 1
+
+COMBI.AllSmelt = true
+COMBI.Max = 50
+
+GMS.RegisterCombi( COMBI, "gms_mithrilfactory" )
diff --git a/gamemode/craftablesystem/misc/obelisk.lua b/gamemode/craftablesystem/misc/obelisk.lua
new file mode 100644
index 0000000..dd22752
--- /dev/null
+++ b/gamemode/craftablesystem/misc/obelisk.lua
@@ -0,0 +1,48 @@
+/*Obelisk*/
+local COMBI = {}
+
+COMBI.Name = "Obelisk"
+COMBI.Description = "A broken down obelisk used to make basic runes"
+
+COMBI.Req = {}
+COMBI.Req["Strange_Stone"] = 50
+
+COMBI.Results = "gms_obelisk"
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.BuildSiteModel = "models/props_c17/gravestone_cross001b.mdl"
+
+GMS.RegisterCombi( COMBI, "Structures" )
+
+
+local COMBI = {}
+
+COMBI.Name = "Basic Rune"
+COMBI.Description = "the most basic rune used for inscribing"
+COMBI.Entity = "gms_obelisk"
+
+COMBI.Req = {}
+COMBI.Req["Strange_Stone"] = 5
+
+COMBI.Results = {}
+COMBI.Results["Basic_Rune"] = 1
+
+GMS.RegisterCombi ( COMBI, "gms_obelisk")
+
+local COMBI = {}
+
+COMBI.Name = "Chisel"
+COMBI.Description = "Effective in cutting stone"
+COMBI.Entity = "gms_obelisk"
+
+COMBI.Req = {}
+COMBI.Req["Iron"] = 30
+COMBI.Req["Wood"] = 5
+COMBI.Req["Strange_Stone"] = 5
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 40
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_chisel"
+
+GMS.RegisterCombi ( COMBI, "gms_obelisk")
diff --git a/gamemode/craftablesystem/misc/runealter.lua b/gamemode/craftablesystem/misc/runealter.lua
new file mode 100644
index 0000000..2005704
--- /dev/null
+++ b/gamemode/craftablesystem/misc/runealter.lua
@@ -0,0 +1,83 @@
+------------------------------------------------Rune Altar--------------------------------------
+local COMBI = {}
+
+COMBI.Name = "Rune Altar"
+COMBI.Description = "A basic Altar used for making runes"
+
+COMBI.Req = {}
+COMBI.Req["Strange_Stone"] = 100
+COMBI.Req["Stone"] = 500
+COMBI.Req["Basic_Rune"] = 10
+
+COMBI.Results = "gms_runealtar"
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.BuildSiteModel = "models/xqm/rails/cap.mdl"
+
+GMS.RegisterCombi( COMBI, "Structures" )
+
+ local COMBI = {}
+
+COMBI.Name = "Fire Rune"
+COMBI.Description = "A rune infused with the element of fire"
+COMBI.Entity = "gms_runealtar"
+
+COMBI.Req = {}
+COMBI.Req["Basic_Rune"] = 1
+COMBI.Req["Charcoal"] = 10
+COMBI.Req["Strange_Stone"] = 20
+
+COMBI.Results = {}
+COMBI.Results["Fire_Rune"] = 1
+
+
+GMS.RegisterCombi( COMBI, "gms_runealtar" )
+
+local COMBI = {}
+
+COMBI.Name = "Water Rune"
+COMBI.Description = "A rune infused with the element of water"
+COMBI.Entity = "gms_runealtar"
+
+COMBI.Req = {}
+COMBI.Req["Basic_Rune"] = 1
+COMBI.Req["Water_Bottles"] = 10
+COMBI.Req["Strange_Stone"] = 20
+
+COMBI.Results = {}
+COMBI.Results["Water_Rune"] = 1
+
+
+GMS.RegisterCombi( COMBI, "gms_runealtar" )
+
+local COMBI = {}
+
+COMBI.Name = "Air Rune"
+COMBI.Description = "A rune infused with the element of air"
+COMBI.Entity = "gms_runealtar"
+
+COMBI.Req = {}
+COMBI.Req["Basic_Rune"] = 1
+COMBI.Req["Dust"] = 10
+COMBI.Req["Strange_Stone"] = 20
+
+COMBI.Results = {}
+COMBI.Results["Air_Rune"] = 1
+
+
+GMS.RegisterCombi( COMBI, "gms_runealtar" )
+
+local COMBI = {}
+
+COMBI.Name = "Earth Rune"
+COMBI.Description = "A rune infused with the element of earth"
+COMBI.Entity = "gms_runealtar"
+
+COMBI.Req = {}
+COMBI.Req["Basic_Rune"] = 1
+COMBI.Req["Wood"] = 10
+COMBI.Req["Strange_Stone"] = 20
+
+COMBI.Results = {}
+COMBI.Results["Earth_Rune"] = 1
+
+GMS.RegisterCombi( COMBI, "gms_runealtar" )
diff --git a/gamemode/craftablesystem/misc/runeinfuser.lua b/gamemode/craftablesystem/misc/runeinfuser.lua
new file mode 100644
index 0000000..151aa57
--- /dev/null
+++ b/gamemode/craftablesystem/misc/runeinfuser.lua
@@ -0,0 +1,113 @@
+local COMBI = {}
+
+COMBI.Name = "Runic Infuser"
+COMBI.Description = "A basic place for infusing tools"
+
+COMBI.Req = {}
+COMBI.Req["Strange_Stone"] = 200
+COMBI.Req["Stone"] = 200
+COMBI.Req["Basic_Rune"] = 20
+
+COMBI.Results = "gms_runicinfuser"
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.BuildSiteModel = "models/maxofs2d/hover_rings.mdl"
+
+GMS.RegisterCombi( COMBI, "Structures" )
+
+local COMBI = {}
+
+COMBI.Name = "Pickaxe Head"
+COMBI.Description = "it might be dull but it gets the job done"
+COMBI.Entity = "gms_runicinfuser"
+
+COMBI.Req = {}
+COMBI.Req["Stone"] = 150
+COMBI.Req["Strange_Stone"] = 20
+
+COMBI.Results = {}
+COMBI.Results["Pickaxe_Head"] = 1
+
+GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
+
+local COMBI = {}
+
+COMBI.Name = "Pickaxe Handle"
+COMBI.Description = "a sturdy handle for a sturdy tool"
+COMBI.Entity = "gms_runicinfuser"
+
+COMBI.Req = {}
+COMBI.Req["Stone"] = 100
+COMBI.Req["Strange_Stone"] = 15
+
+COMBI.Results = {}
+COMBI.Results["Pickaxe_Handle"] = 1
+
+GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
+
+local COMBI = {}
+
+COMBI.Name = "Air Rune Pickaxe"
+COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
+COMBI.Entity = "gms_runicinfuser"
+
+COMBI.Req = {}
+COMBI.Req["Pickaxe_Head"] = 1
+COMBI.Req["Pickaxe_Handle"] = 1
+COMBI.Req["Air_Rune"] = 3
+COMBI.Req["Strange_Stone"] = 15
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_runeapickaxe"
+
+GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
+
+local COMBI = {}
+
+COMBI.Name = "Earth Rune Pickaxe"
+COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
+COMBI.Entity = "gms_runicinfuser"
+
+COMBI.Req = {}
+COMBI.Req["Pickaxe_Head"] = 1
+COMBI.Req["Pickaxe_Handle"] = 1
+COMBI.Req["Earth_Rune"] = 3
+COMBI.Req["Strange_Stone"] = 15
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_runeepickaxe"
+
+GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
+
+local COMBI = {}
+
+COMBI.Name = "Fire Rune Pickaxe"
+COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
+COMBI.Entity = "gms_runicinfuser"
+
+COMBI.Req = {}
+COMBI.Req["Pickaxe_Head"] = 1
+COMBI.Req["Pickaxe_Handle"] = 1
+COMBI.Req["Fire_Rune"] = 3
+COMBI.Req["Strange_Stone"] = 15
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_runefpickaxe"
+
+GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
+
+local COMBI = {}
+
+COMBI.Name = "Water Rune Pickaxe"
+COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
+COMBI.Entity = "gms_runicinfuser"
+
+COMBI.Req = {}
+COMBI.Req["Pickaxe_Head"] = 1
+COMBI.Req["Pickaxe_Handle"] = 1
+COMBI.Req["Water_Rune"] = 3
+COMBI.Req["Strange_Stone"] = 15
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_runewpickaxe"
+
+GMS.RegisterCombi( COMBI, "gms_runicinfuser" )
diff --git a/gamemode/craftablesystem/workbenches/mythrilworkbench.lua b/gamemode/craftablesystem/workbenches/mythrilworkbench.lua
new file mode 100644
index 0000000..91a5e3a
--- /dev/null
+++ b/gamemode/craftablesystem/workbenches/mythrilworkbench.lua
@@ -0,0 +1,30 @@
+local COMBI = {}
+
+COMBI.Name = "Mithril WorkBench"
+COMBI.Description = "A very basic industrial crafting station"
+
+COMBI.Req = {}
+COMBI.Req["Pure_Mithril"] = 200
+COMBI.Req["Teak"] = 20
+
+COMBI.Results = "gms_mithrilworkbench"
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.BuildSiteModel = "models/props_wasteland/kitchen_counter001c.mdl"
+
+GMS.RegisterCombi( COMBI, "Structures" )
+
+local COMBI = {}
+
+COMBI.Name = "Mithril Pickaxe"
+COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
+COMBI.Entity = "gms_mithrilworkbench"
+
+COMBI.Req = {}
+COMBI.Req["Pure_Mithril"] = 50
+COMBI.Req["Teak"] = 25
+
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_mithrilpickaxe"
+
+GMS.RegisterCombi( COMBI, "gms_mithrilworkbench" )
diff --git a/gamemode/craftablesystem/workbenches/platinumworkbench.lua b/gamemode/craftablesystem/workbenches/platinumworkbench.lua
index fac5606..839b48b 100644
--- a/gamemode/craftablesystem/workbenches/platinumworkbench.lua
+++ b/gamemode/craftablesystem/workbenches/platinumworkbench.lua
@@ -45,3 +45,25 @@ COMBI.Texture = "gms_icons/gms_weapon.png"
 COMBI.SwepClass = "gms_platinumhatchet"
 
 GMS.RegisterCombi( COMBI, "gms_platinumworkbench" )
+
+local COMBI = {}
+
+
+COMBI.Name = "Pickaxe of Djarex"
+COMBI.Description = "A strange pickaxe that has a tendency to only mine a weird type of stone"
+COMBI.Entity = "gms_platinumworkbench"
+
+COMBI.Req = {}
+COMBI.Req["Platinum"] = 25
+COMBI.Req ["Steel"] = 25
+COMBI.Req ["Gold"] = 25
+COMBI.Req["Elm"] = 50
+COMBI.Req["Mahogany"] = 50
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 50
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_pickaxeofdjarex"
+
+GMS.RegisterCombi( COMBI, "gms_platinumworkbench" )
diff --git a/gamemode/craftablesystem/workbenches/steelworkbench.lua b/gamemode/craftablesystem/workbenches/steelworkbench.lua
index b8f5117..6d2a8d4 100644
--- a/gamemode/craftablesystem/workbenches/steelworkbench.lua
+++ b/gamemode/craftablesystem/workbenches/steelworkbench.lua
@@ -45,3 +45,21 @@ COMBI.Texture = "gms_icons/gms_weapon.png"
 COMBI.SwepClass = "gms_steelhatchet"
 
 GMS.RegisterCombi( COMBI, "gms_steelworkbench" )
+
+local COMBI = {}
+
+COMBI.Name = "Bucket"
+COMBI.Description = "a simple bucket for simple needs"
+COMBI.Entity = "gms_steelworkbench"
+
+COMBI.Req = {}
+COMBI.Req["Steel"] = 30
+COMBI.Req["Wood"] = 5
+
+COMBI.SkillReq = {}
+COMBI.SkillReq["Weapon_Crafting"] = 30
+
+COMBI.Texture = "gms_icons/gms_weapon.png"
+COMBI.SwepClass = "gms_bucket"
+
+GMS.RegisterCombi ( COMBI, "gms_steelworkbench")