diff --git a/README.md b/README.md
index ec256e9e5..678b0564e 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ Included Custom Addons
* Contractor Mi-17 Pack by lennard91 - http://www.armaholic.com/page.php?id=18498
* "Heckler & Koch" MP7 by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=8379
* P99 Projekt by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=9985
+* FAMAS Pack by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=8867
--------------------------
Included Custom Islands
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
index 7df93a3e5..eaaddbc24 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -119,6 +119,7 @@ weaponsEU[] =
{Loot_WEAPON, 5, m8_holo_sd},
{Loot_WEAPON, 5, m8_carbine},
{Loot_WEAPON, 5, L85A2_DZ},
+ {Loot_WEAPON, 5, Famas_DZ},
{Loot_WEAPON, 5, SCAR_L_CQC_CCO_SD},
{Loot_WEAPON, 5, SCAR_L_CQC},
{Loot_WEAPON, 5, SCAR_L_CQC_Holo},
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
index 50a796abf..6e9219f8c 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
@@ -129,6 +129,12 @@ class Category_16 {
class CZ805_A1_GL_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};};
class CZ805_A2_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
class CZ805_A2_SD_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
+ class Famas_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
+ class Famas_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
+ class Famas_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
+ class Famas_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};};
+ class Famas_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};};
+ class Famas_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};};
class G36C_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
class G36C_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class G36C_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
index c0473096b..a3f49dfa7 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
@@ -77,10 +77,13 @@ class CfgWeapons
class M4A1;
class M4A1_AIM_SD_camo;
#include "Rifles\M4A1.hpp"
+ //Famas
+ #include "Rifles\Famas.hpp"
class M14_EP1;
#include "Rifles\M14.hpp"
+ //CZ 805
#include "Rifles\CZ805.hpp"
class M24 : Rifle
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
index fa3c5b7e0..82d393ddb 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
@@ -19,7 +19,7 @@ class CZ805_A2_DZ: CZ805_A2_ACR {
class CZ805_A2_SD_ACR;
class CZ805_A2_SD_DZ: CZ805_A2_SD_ACR {
displayName = $STR_DZ_WPN_CZ_805A2_SD_NAME;
- descriptionShort = $STR_DZ_WPN_CZ_805A_DESC;
+ descriptionShort = $STR_DZ_WPN_CZ_805A_SD_DESC;
};
class CZ805_B_GL_ACR;
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
new file mode 100644
index 000000000..0befb07ea
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
@@ -0,0 +1,180 @@
+class Famas_DZ: M4A1
+{
+ displayName = $STR_DZ_WPN_FAMAS_NAME;
+ model = "\C1987_Famas\Famas_f1.p3d";
+ picture = "\C1987_Famas\equip\famas_f1.paa";
+ handAnim[] = {"OFP2_ManSkeleton","\CA\weapons\Data\Anim\Bizon.rtm"};
+ reloadMagazineSound[] = {"\C1987_Famas\sound\Famas_Reload.wss",0.056234,1,20};
+ modes[] = {"Single","Fullauto"};
+ class Single: Mode_SemiAuto
+ {
+ sound[] = {"\C1987_famas\sound\Famas.wss",1.778279,1,1000};
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ };
+ class FullAuto: Mode_FullAuto
+ {
+ sound[] = {"\C1987_famas\sound\Famas.wss",1.778279,1,1000};
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ };
+ descriptionShort = $STR_DZ_WPN_CZ_805A_DESC;
+
+ magazines[] =
+ {
+ 30Rnd_556x45_Stanag,
+ 30Rnd_556x45_StanagSD,//Allow both SD and non-SD
+ 30Rnd_556x45_G36,
+ 30Rnd_556x45_G36SD,
+ 100Rnd_556x45_BetaCMag,
+ 20Rnd_556x45_Stanag,
+ 60Rnd_556x45_Stanag_tape_ice_DZE
+ };
+
+ class Attachments
+ {
+ Attachment_CCO = "Famas_CCO_DZ";
+ Attachment_Holo = "Famas_Holo_DZ";
+ Attachment_Sup556 = "Famas_SD_DZ";
+ };
+};
+
+class Famas_CCO_DZ: Famas_DZ
+{
+ displayName = $STR_DZ_WPN_FAMAS_COO_NAME;
+ model = "\C1987_Famas\Famas_f1_aim.p3d";
+ picture = "\C1987_Famas\equip\famas_f1_aim.paa";
+
+ class Attachments
+ {
+ Attachment_Sup556 = "Famas_CCO_SD_DZ";
+ };
+
+ class ItemActions
+ {
+ class RemoveCCO
+ {
+ text = $STR_DZ_ATT_CCO_RMVE;
+ script = "; ['Attachment_CCO',_id,'Famas_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class Famas_Holo_DZ: Famas_DZ
+{
+ displayName = $STR_DZ_WPN_FAMAS_HOLO_NAME;
+ model = "\C1987_Famas\Famas_f1_eot.p3d";
+ picture = "\C1987_Famas\equip\famas_f1_eot.paa";
+
+ class Attachments
+ {
+ Attachment_Sup556 = "Famas_Holo_SD_DZ";
+ };
+
+ class ItemActions
+ {
+ class RemoveHolo
+ {
+ text = $STR_DZ_ATT_HOLO_RMVE;
+ script = "; ['Attachment_Holo',_id,'Famas_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class Famas_SD_DZ: M4A1_AIM_SD_camo
+{
+ displayName = $STR_DZ_WPN_FAMAS_SD_NAME;
+ model = "\C1987_Famas\Famas_f1_sd.p3d";
+ picture = "\C1987_Famas\equip\famas_f1_sd.paa";
+ handAnim[] = {"OFP2_ManSkeleton","\CA\weapons\Data\Anim\Bizon.rtm"};
+ reloadMagazineSound[] = {"\C1987_Famas\sound\Famas_Reload.wss",0.056234,1,20};
+ fireLightDuration = 0.0;
+ fireLightIntensity = 0.0;
+ modes[] = {"Single","Fullauto"};
+ class Single: Mode_SemiAuto
+ {
+ sound[] = {"\C1987_famas\sound\Famas_sd.wss",1.0,1,300};
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ };
+ class FullAuto: Mode_FullAuto
+ {
+ sound[] = {"\C1987_famas\sound\Famas_sd.wss",1.0,1,300};
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ };
+ descriptionShort = $STR_DZ_WPN_CZ_805A_SD_DESC;
+
+ magazines[] =
+ {
+ 30Rnd_556x45_StanagSD,
+ 30Rnd_556x45_Stanag,//Allow both SD and non-SD
+ 30Rnd_556x45_G36SD,
+ 30Rnd_556x45_G36,
+ 100Rnd_556x45_BetaCMag,
+ 20Rnd_556x45_Stanag,
+ 60Rnd_556x45_Stanag_tape_ice_DZE
+ };
+
+ class Attachments
+ {
+ Attachment_CCO = "Famas_CCO_SD_DZ";
+ Attachment_Holo = "Famas_Holo_SD_DZ";
+ };
+
+ class ItemActions
+ {
+ class RemoveSuppressor
+ {
+ text = $STR_ATTACHMENT_RMVE_Silencer;
+ script = "; ['Attachment_Sup556',_id,'Famas_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class Famas_CCO_SD_DZ: Famas_SD_DZ
+{
+ displayName = $STR_DZ_WPN_FAMAS_COO_SD_NAME;
+ model = "\C1987_Famas\Famas_f1_aim_sd.p3d";
+ picture = "\C1987_Famas\equip\famas_f1_aim_sd.paa";
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveCCO
+ {
+ text = $STR_DZ_ATT_CCO_RMVE;
+ script = "; ['Attachment_CCO',_id,'Famas_SD_DZ'] call player_removeAttachment";
+ };
+ class RemoveSuppressor
+ {
+ text = $STR_ATTACHMENT_RMVE_Silencer;
+ script = "; ['Attachment_Sup556',_id,'Famas_CCO_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class Famas_Holo_SD_DZ: Famas_SD_DZ
+{
+ displayName = $STR_DZ_WPN_FAMAS_HOLO_SD_NAME;
+ model = "\C1987_Famas\Famas_f1_eot_sd.p3d";
+ picture = "\C1987_Famas\equip\famas_f1_eot_sd.paa";
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveHolo
+ {
+ text = $STR_DZ_ATT_HOLO_RMVE;
+ script = "; ['Attachment_Holo',_id,'Famas_SD_DZ'] call player_removeAttachment";
+ };
+ class RemoveSuppressor
+ {
+ text = $STR_ATTACHMENT_RMVE_Silencer;
+ script = "; ['Attachment_Sup556',_id,'Famas_Holo_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 4e63df216..f5f8062ec 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -11611,11 +11611,16 @@
Assault Rifle <br/>Caliber: 5.56x45mm
Sturmgewehr <br/>Kaliber: 5.56x45mm
+
+ Silenced Assault Rifle <br/>Caliber: 5.56x45mm
+ Schallgedämpftes Sturmgewehr <br/>Kaliber: 5.56x45mm
+
Assault Rifle <br/>Caliber: 7.62x51mm
Sturmgewehr <br/>Kaliber: 7.62x51mm
-
+
+
M16A2 (Rusty)
M16A2 (Rostig)
@@ -11787,15 +11792,12 @@
Hangtompítós géppisztoly <br/> Kaliber: 4.6x30mm
-
-
+
P99
- P99
P99 SD
- P99 SD
Semi-automatic Pistol <br/>Caliber: 10x22mm
@@ -11804,7 +11806,28 @@
Silenced Semi-automatic Pistol <br/>Caliber: 10x22mm SD
Schallgedämpfte halbautomatische Pistole <br/>Kaliber: 10x22mm SD
+
+
+
+
+ Famas
+
+
+ Famas CCO
+
+
+ Famas Holo
+
+
+ Famas SD
+
+
+ Famas CCO SD
+
+
+ Famas Holo SD
+