Re-Added Unused Dependencies, :)

addons/501st_Helmets/AB/data/pilot_lum.rvmat

@@ -0,0 +1,85 @@
+
+#define _ARMA_
+
+class StageTI
+{
+	texture = "a3\characters_f\blufor\data\clothing1_ti_ca.paa";
+};
+ambient[] = {1,1,1,1};
+diffuse[] = {1,1,1,1};
+forcedDiffuse[] = {0,0,0,1};
+emmisive[]={0,0,0,1};
+specular[] = {0.2,0.2,0.2,1};
+specularPower = 50;
+PixelShaderID = "Super";
+VertexShaderID = "Super";
+class Stage1
+{
+	texture = "SWOP_clones\data\clonePilotHelmet_n.paa";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,0};
+		pos[] = {0,0,0};
+	};
+};
+class Stage2
+{
+	texture = "#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {10,0,0};
+		up[] = {0,10,0};
+		dir[] = {0,0,0};
+		pos[] = {0,0,0};
+	};
+};
+class Stage3
+{
+	texture = "#(argb,8,8,3)color(0,0,0,0,MC)";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,0};
+		pos[] = {0,0,0};
+	};
+};
+class Stage4
+{
+	texture = "SWOP_clones\data\clonePilotHelmet_as.paa";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,1};
+		pos[] = {0,0,1};
+	};
+};
+class Stage5
+{
+	texture = "SWOP_clones\data\clonePilotHelmet_smdi.paa";
+	uvSource = "tex";
+	class uvTransform
+	{
+		aside[] = {1,0,0};
+		up[] = {0,1,0};
+		dir[] = {0,0,1};
+		pos[] = {0,0,1};
+	};
+};
+class Stage6
+{
+	texture = "#(ai,64,64,1)fresnel(1.53,2.44)";
+	uvSource = "none";
+};
+class Stage7
+{
+	texture = "A3\data_f\env_land_co.paa";
+	uvSource = "none";
+};

addons/501st_Helmets/config.cpp

@@ -1,11 +1,4 @@
-////////////////////////////////////////////////////////////////////
-//DeRap: 501st_AB_Helmets\config.bin
-//Produced from mikero's Dos Tools Dll version 6.44
-//'now' is Sat Jul 14 06:15:55 2018 : 'file' last modified on Thu Jul 12 22:56:57 2018
-//http://dev-heaven.net/projects/list_files/mikero-pbodll
-////////////////////////////////////////////////////////////////////
-
-#define _ARMA_
+#include "..\RD501_Main\config_macros.hpp"
 
 class CfgPatches
 {
@@ -22,4 +15,58 @@ class CfgPatches
 };
 class CfgWeapons
 {
+	class H_HelmetB;
+	class HeadgearItem;
+	class macro_new_helmet(pilot,base): H_HelmetB
+	{
+		scope = 2;
+		scopeArsenal = 2;
+		author = "RD501";
+		weaponPoolAvailable = 1;
+		ace_hearing_protection = 0.85;
+		ace_hearing_lowerVolume = 0;    
+		displayName = "[501st] PLT HELM (Base)";
+		model = "\501st_helmets\AB\AB_helmet_p1.p3d";
+		hiddenSelections[] = {
+			"camo1",
+			"mat"
+		};
+
+		hiddenSelectionsTextures[]=
+        {
+            "RD501_Helmets\_textures\aviation\clonePilotHelmet_co.paa"
+        };
+        hiddenSelectionsMaterials[]=
+        {
+            "",
+            "501st_Helmets\AB\data\pilot_jlts.rvmat"
+        };
+
+
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformmodel = "\501st_helmets\AB\AB_helmet_p1.p3d";//"SWOP_clones\helmet\CloneHelmetPilot.p3d";
+			modelSides[] = {6};
+			hiddenSelections[] = {
+				"camo1",
+				"mat"
+			};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+
+		subItems[] = {"G_B_Diving","ItemcTabHCam"};
+	};
 };

addons/RD501_Helmets/config.cpp

@@ -105,8 +105,7 @@ class CfgWeapons
 		scope = 2;
 		scopeArsenal = 2;
 		author = "RD501";
-		weaponPoolAvailable = 1;       
-		subItems[] = {"G_B_Diving"};
+		weaponPoolAvailable = 1;
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;    
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
@@ -542,7 +541,7 @@ class CfgWeapons
 		displayName = "[501st] INF SNOW HELM 01";
         hiddenSelections[] = {"Camo1"};
 		hiddenSelectionsTextures[] = {"armor_unit\21\helmet\21_Helmet_co.paa"};
-        hiddenSelectionsMaterials[]= {"armor_unit\armor_unit\21\helmet\helm.rvmat"};
+        hiddenSelectionsMaterials[]= {"armor_unit\21\helmet\helm.rvmat"};
 		model = "\armor_unit\21\HelmetP2_21.p3d";
         picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
 		class ItemInfo: HeadgearItem

addons/RD501_Helmets/mynock/config.cpp

@@ -7,11 +7,11 @@ class CfgPatches
 {
 	class macro_patch_name(mynock_helmets)
 	{
-		author=DANKAUTHORS
-		addonRootClass= macro_patch_name(helmets)
+		author=MACRO_QUOTE(DANKAUTHORS);
+		addonRootClass=MACRO_QUOTE(macro_patch_name(helmets));
 		requiredAddons[]=
 		{
-			macro_patch_name(helmets)
+			MACRO_QUOTE(macro_patch_name(helmets))
 		};
 		requiredVersion=0.1;
 		units[]={};
@@ -21,7 +21,7 @@ class CfgPatches
 
 class CfgWeapons
 {
-	class macro_new_helmet(mynock,3as_base);
+	class macro_new_helmet(mynock,base_3as);
 	NEW_501_MYN_Helm_3AS(cic,CI-C,501st_Tanker_CI-C.paa)
 	NEW_501_MYN_Helm_3AS(ci,CI,501st_Tanker_CI.paa)
 	NEW_501_MYN_Helm_3AS(cmc,CM-C,501st_Tanker_CM-C.paa)

addons/RD501_Units/other/config.cpp

@@ -52,15 +52,7 @@ class CfgGlasses
 	class macro_new_glass(remove_blue): macro_new_glass(Diving_Goggles)
 	{
 		displayName = "Color Suppression Chip (Blue)";
-<<<<<<< HEAD
-<<<<<<< HEAD
 		author = macro_quote(DANKAUTHORS);
-=======
-		author = DANKAUTHORS;
->>>>>>> 2cf7727fc3148c63ccb2bff9b54907561352f0da
-=======
-		author = MACRO_QUOTE(DANKAUTHORS);
->>>>>>> 6978df9e15363c55217d970c426bac7c6fa52012
 		picture = "\RD501_Units\textures\icons\no_blue.paa";
 		scope = 2;
 		scopeCurator = 2;