Merge new MultiPlayerSetup and autojoin

SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp

@@ -252,7 +252,6 @@ class CfgWeapons
 	#include "Tools\Flashlight.hpp"
 	#include "Tools\FlashlightRed.hpp"
 	
-	#include "Item\Flare.hpp"
 	#include "Item\ItemKeyKit.hpp"
 	#include "Item\ItemKeys.hpp"
 	

SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp

@@ -1,36 +0,0 @@
-class Flare : GrenadeLauncher {
-		class ThrowMuzzle;
-		class MolotovCocktailMuzzle : ThrowMuzzle {
-			displayName = $STR_ACTION_THROW;
-			magazines[] = {
-				"TrashJackDaniels", 
-				"ItemSodaEmpty", 
-				"TrashTinCan",
-				"FoodCanGriffEmpty",
-				"FoodCanBadguyEmpty",
-				"FoodCanBoneboyEmpty",
-				"FoodCanCornEmpty",
-				"FoodCanCurgonEmpty",
-				"FoodCanDemonEmpty",
-				"FoodCanFraggleosEmpty",
-				"FoodCanHerpyEmpty",
-				"FoodCanOrlokEmpty",
-				"FoodCanPowellEmpty",
-				"FoodCanTylersEmpty",
-				"FoodCanUnlabeledEmpty",
-				"ItemSodaCokeEmpty",
-				"ItemSodaPepsiEmpty",
-				"ItemSodaMdewEmpty",
-				"ItemSodaMtngreenEmpty",
-				"ItemSodaR4z0rEmpty",
-				"ItemSodaClaysEmpty",
-				"ItemSodaSmashtEmpty", 
-				"ItemSodaDrwasteEmpty", 
-				"ItemSodaLemonadeEmpty", 
-				"ItemSodaLvgEmpty", 
-				"ItemSodaMzlyEmpty", 
-				"ItemSodaRabbitEmpty",
-				"ItemTrashToiletpaper"
-			};          
-		};
-	}; 

SQF/dayz_code/Configs/CfgWeapons/Loot.hpp

@@ -1,55 +1,36 @@
-class Loot: Default
+class Loot : Default
 {
 	scope = public;
 	value = 0;
-	type = 0;
+	type = WeaponNoSlot;
 	displayName = "Use";
-	canDrop = 0;
-	muzzles[] = {"this"};
-	magazines[] = {
-		"ItemSepsisBandage",
-		"FoodBioMeat",
-		"ItemZombieParts",
+	canDrop = false;
+	muzzles[] = {this};
+	modes[] = {this};
+	useAction = false;
+	useActionTitle = "";
+	enableAttack = false;
+	showToPlayer = false;
+	
+	//Insert here magazines to show up as "Take x" in action menu
+	magazines[] =
+	{
+		//medical
 		"ItemBandage",
+		"ItemSepsisBandage",
+		"ItemPainkiller",
+		"ItemMorphine",
+		"ItemAntibiotic",
 		"ItemHeatPack",
-		"PartWoodPile",
-		"PartFueltank",
+		"ItemEpinephrine"
+		
+		//vehicle parts
+		/*"PartFueltank",
 		"PartWheel",
 		"PartGeneric",
 		"PartEngine",
 		"PartVRotor",
 		"PartGlass",
-		"ItemWaterbottle",
-		"ItemWaterbottleUnfilled",
-		"ItemEpinephrine",
-		"ItemGoldBar",
-		"ItemSilverBar",
-		"ItemMorphine",
-		"ItemBloodbag",
-		"ItemAntibiotic",
-		"ItemPainkiller",
-		"ItemJerrycan",
-		"ItemOilBarrel",
-		"ItemGenerator",
-		"ItemTent",
-		"ItemSandbag",
-		"ItemTankTrap",
-		"ItemWire",
-		"FoodSteakRaw",
-		"TrashTinCan",
-		"ItemSodaCoke",
-		"ItemSodaPepsi",
-		"ItemSodaMdew",
-		"FoodEdible",
-		"FoodBeefCooked",
-		"FoodCanBakedBeans",
-		"FoodCanSardines",
-		"FoodCanFrankBeans",
-		"FoodCanPasta"
+		"ItemJerrycan",*/
 	};
-	modes[] = {"this"};
-	useAction = 0;
-	useActionTitle = "";
-	enableAttack = 0;
-	showToPlayer = 0;
-};
+};