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

This commit is contained in:
2025-05-19 16:31:58 -05:00

View File

@@ -148,7 +148,7 @@ class DisallowedEquipment {
}; };
class tabbedItems { // Items that are allowed for individuals with Ranger Tab 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."; description = "Items that are allowed for individuals with Ranger Tab.";
items[] = { items[] = {
"optic_tws", // Thermal Optic "optic_tws", // Thermal Optic
@@ -283,7 +283,22 @@ class DisallowedEquipment {
"rhs_weap_m16a4_grip_acog_usmc", //M16 Series "rhs_weap_m16a4_grip_acog_usmc", //M16 Series
"rhs_weap_m16a4_grip_acog2_usmc", //M16 Series "rhs_weap_m16a4_grip_acog2_usmc", //M16 Series
"rhs_weap_m32", //M32/MGL 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
}; };
}; };