Compare commits

..

8 Commits

Author SHA1 Message Date
1fbda6ac95 Merge pull request 'aj-campaign-update-5-17-2025' (#64) from aj-campaign-update-5-17-2025 into develop
Some checks failed
Generate testing snapshot / Create testing release (push) Has been cancelled
Reviewed-on: #64
2025-05-19 16:32:08 -05:00
dbc380c6af Merge branch 'develop' into aj-campaign-update-5-17-2025 2025-05-19 16:31:58 -05:00
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
840652f853 Update defines/SupplyCrates.hpp
Added new resupply Mags for KAR and JCA
2025-05-18 19:12:45 -05:00
05936d9213 Update defines/DisallowedEquipment.hpp
Added AJ's T-Shirts to the Tabbed Weapons
2025-05-05 23:44:21 -05:00
84ab6a1ca7 Update defines/BattalionInfo.hpp
Updated Alpha Callsign
2025-05-04 15:11:46 -05:00
175988efe6 Removed PVS14 and PVS15 from Blacklist 2025-05-04 00:04:36 -05:00
5 changed files with 16 additions and 7 deletions

View File

@@ -7,7 +7,7 @@
#define COMMAND_CALLSIGN POWERLINE #define COMMAND_CALLSIGN POWERLINE
//#define RRC_CALLSIGN TIGER //#define RRC_CALLSIGN TIGER
//#define MEDIC_CALLSIGN LIFELINE //#define MEDIC_CALLSIGN LIFELINE
#define ALPHA_CALLSIGN NOMAD #define ALPHA_CALLSIGN KINGPIN
#define ECHO_CALLSIGN WARLORD #define ECHO_CALLSIGN WARLORD
#define WPN_CALLSIGN BLACKFOOT #define WPN_CALLSIGN BLACKFOOT

View File

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

View File

@@ -36,6 +36,9 @@ class SupplyCrates {
{"Tier1_20Rnd_762x51_M993_SR25_Mag",25}, {"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
{"KAR_20Rnd_Fury_blk",25}, {"KAR_20Rnd_Fury_blk",25},
{"rhsusf_m112_mag",25}, {"rhsusf_m112_mag",25},
{"JCA_20Rnd_762x51_PMAG",25},
{"JCA_20Rnd_762x51_Tracer_Red_PMAG",25},
{"KAR_100Rnd_Fury_blk",25},
}; };
items[] = {}; items[] = {};
}; };
@@ -58,7 +61,8 @@ class SupplyCrates {
{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50}, {"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
{"Titan_AA",10}, {"Titan_AA",10},
{"Titan_AT",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[] = {}; items[] = {};
}; };

View File

@@ -248,6 +248,11 @@ class VehicleFlags {
actionTitle = "17th Emblem"; actionTitle = "17th Emblem";
texture = "textures\flags_misc\flag_17th_emblem_co.paa"; 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 { class RedCross {
actionID = "flag_redcross"; actionID = "flag_redcross";
actionTitle = "Red Cross"; actionTitle = "Red Cross";

Binary file not shown.