Merge branch 'develop' into aj-campaign-update-5-17-2025

revert 05936d9213
revert Update defines/DisallowedEquipment.hpp Added AJ's T-Shirts to the Tabbed Weapons
2025-05-19 16:31:58 -05:00 · 2025-05-19 16:31:42 -05:00 · 2025-05-19 16:31:24 -05:00 · 2025-05-19 16:18:17 -05:00 · 2025-05-18 19:12:45 -05:00 · 2025-05-05 23:44:21 -05:00
5 changed files with 33 additions and 9 deletions
--- a/defines/BattalionInfo.hpp
+++ b/defines/BattalionInfo.hpp
@@ -7,7 +7,7 @@
 #define COMMAND_CALLSIGN POWERLINE
 //#define RRC_CALLSIGN TIGER
 //#define MEDIC_CALLSIGN LIFELINE
-#define ALPHA_CALLSIGN NOMAD
+#define ALPHA_CALLSIGN KINGPIN
 #define ECHO_CALLSIGN WARLORD
 #define WPN_CALLSIGN BLACKFOOT

--- a/defines/DisallowedEquipment.hpp
+++ b/defines/DisallowedEquipment.hpp
@@ -11,9 +11,9 @@ class DisallowedEquipment {
 		label = "BLACKLISTED WEAPON OR ITEM";
 		description = "Items that NO member is allowed to use.";
 		items[] = {
-			"17BN_ANPVS14", // NVG AN/PVS-14
-			"ej_PVS15D", // NVG AN/PVS-15
-			"ej_PVS15", // NVG AN/PVS-15
+			//"17BN_ANPVS14", // NVG AN/PVS-14
+			//"ej_PVS15D", // NVG AN/PVS-15
+			//"ej_PVS15", // NVG AN/PVS-15
 			"LMG_Mk200_black_F", //Mk200 Series
 			"LMG_Mk200_F", //Mk200 Series
 			"rhs_weap_g36c", // G36 Series
@@ -95,8 +95,8 @@ class DisallowedEquipment {
 			"UK3CB_M14DMR_Railed_BLK", // M14 Series
 			"UK3CB_M14DMR_Railed", // M14 Series
 			"UK3CB_M14DMR", // M14 Series
-			"USP_PVS_14", // NVG AN/PVS-14
-			"USP_PVS_15" // NVG AN/PVS-15
+			//"USP_PVS_14", // NVG AN/PVS-14
+			//"USP_PVS_15" // NVG AN/PVS-15
 		};
 	};

@@ -148,7 +148,7 @@ class DisallowedEquipment {
 	};

 	class tabbedItems { // Items that are allowed for individuals with Ranger Tab
-		label = "TABBED WEAPON";
+		label = "TABBED ITEM";
 		description = "Items that are allowed for individuals with Ranger Tab.";
 		items[] = {
 			"optic_tws", // Thermal Optic
@@ -283,7 +283,22 @@ class DisallowedEquipment {
 			"rhs_weap_m16a4_grip_acog_usmc", //M16 Series
 			"rhs_weap_m16a4_grip_acog2_usmc", //M16 Series
 			"rhs_weap_m32", //M32/MGL Series
-			"rhs_weap_m32_usmc" //M32/MGL Series
+			"rhs_weap_m32_usmc", //M32/MGL Series
+			"G3_Multicam_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_M81_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_TGR_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_Multicam_Tee_BLK", //Tabbed T-Shirt
+			"G3_M81_Tee_BLK", //Tabbed T-Shirt
+			"G3_TGR_Tee_BLK", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Tan", //Tabbed T-Shirt
+			"G3_M81_Tee_Tan", //Tabbed T-Shirt
+			"G3_TGR_Tee_Tan", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Gray", //Tabbed T-Shirt
+			"G3_M81_Tee_Gray", //Tabbed T-Shirt
+			"G3_TGR_Tee_Gray", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Green", //Tabbed T-Shirt
+			"G3_M81_Tee_Green", //Tabbed T-Shirt
+			"G3_TGR_Tee_Green" //Tabbed T-Shirt
 		};
 	};

--- a/defines/SupplyCrates.hpp
+++ b/defines/SupplyCrates.hpp
@@ -36,6 +36,9 @@ class SupplyCrates {
 			{"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
 			{"KAR_20Rnd_Fury_blk",25},
 			{"rhsusf_m112_mag",25},
+			{"JCA_20Rnd_762x51_PMAG",25},
+			{"JCA_20Rnd_762x51_Tracer_Red_PMAG",25},
+			{"KAR_100Rnd_Fury_blk",25},
 		};
 		items[] = {};
 	};
@@ -58,7 +61,8 @@ class SupplyCrates {
 			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
 			{"Titan_AA",10},
 			{"Titan_AT",10},
-			{"200Rnd_65x39_cased_Box_Tracer_Red",50}
+			{"200Rnd_65x39_cased_Box_Tracer_Red",50},
+			{"KAR_100Rnd_Fury_RT_blk",50}
 		};
 		items[] = {};
 	};
--- a/defines/VehicleFlags.hpp
+++ b/defines/VehicleFlags.hpp
@@ -248,6 +248,11 @@ class VehicleFlags {
 				actionTitle = "17th Emblem";
 				texture = "textures\flags_misc\flag_17th_emblem_co.paa";
 			};
+			class WarlordEmblem {
+				actionID = "flag_17th_warlord";
+				actionTitle = "Warlord Emblem";
+				texture = "textures\flags_misc\flag_17th_warlord_co.paa";
+			};
 			class RedCross {
 				actionID = "flag_redcross";
 				actionTitle = "Red Cross";
--- a/textures/flags_misc/flag_17th_warlord_co.paa
+++ b/textures/flags_misc/flag_17th_warlord_co.paa
Author	SHA1	Message	Date
hizumi	dbc380c6af	Merge branch 'develop' into aj-campaign-update-5-17-2025	2025-05-19 16:31:58 -05:00
hizumi	22c1f1a21a	revert `05936d9213` revert Update defines/DisallowedEquipment.hpp Added AJ's T-Shirts to the Tabbed Weapons	2025-05-19 16:31:42 -05:00
hizumi	3f4d4147a3	Warlord emblem addition add new texture for warlord flag and add it to vehicle flag list	2025-05-19 16:31:24 -05:00
hizumi	c9c15681ce	Merge pull request 'Tabbed-Shirt-Update-3-25-2025' (#63 ) from Tabbed-Shirt-Update-3-25-2025 into develop Some checks failed Generate testing snapshot / Create testing release (push) Has been cancelled Details Reviewed-on: #63	2025-05-19 16:18:17 -05:00
EagleTrooper	840652f853	Update defines/SupplyCrates.hpp Added new resupply Mags for KAR and JCA	2025-05-18 19:12:45 -05:00
EagleTrooper	05936d9213	Update defines/DisallowedEquipment.hpp Added AJ's T-Shirts to the Tabbed Weapons	2025-05-05 23:44:21 -05:00
EagleTrooper	84ab6a1ca7	Update defines/BattalionInfo.hpp Updated Alpha Callsign	2025-05-04 15:11:46 -05:00
EagleTrooper	175988efe6	Removed PVS14 and PVS15 from Blacklist	2025-05-04 00:04:36 -05:00
EagleTrooper	b60f7922f3	Update defines/DisallowedEquipment.hpp Added T-Shirt Items	2025-03-25 20:44:01 -05:00