diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
index e226f16f5..20328e668 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
@@ -162,6 +162,8 @@ AmmoUS[] =
{Loot_MAGAZINE, 1, FlareWhite_M203},
{Loot_MAGAZINE, 1, FlareGreen_M203},
{Loot_MAGAZINE, 1, 1Rnd_Smoke_M203},
+ {Loot_MAGAZINE, 1, 1Rnd_SmokeRed_M203},
+ {Loot_MAGAZINE, 1, 1Rnd_SmokeGreen_M203},
// Hand grenades
{Loot_MAGAZINE, 1, SmokeShell},
@@ -225,11 +227,12 @@ AmmoEU[] =
{Loot_MAGAZINE, 1, FlareWhite_M203},
{Loot_MAGAZINE, 1, FlareGreen_M203},
{Loot_MAGAZINE, 1, 1Rnd_Smoke_M203},
+ {Loot_MAGAZINE, 1, 1Rnd_SmokeYellow_M203},
// Hand grenades
- {Loot_MAGAZINE, 1, SmokeShell},
- {Loot_MAGAZINE, 1, SmokeShellRed},
- {Loot_MAGAZINE, 1, SmokeShellGreen},
+ {Loot_MAGAZINE, 1, SmokeShellYellow},
+ {Loot_MAGAZINE, 1, SmokeShellBlue},
+ {Loot_MAGAZINE, 1, SmokeShellOrange},
{Loot_MAGAZINE, 1, HandGrenade_West}
};
diff --git a/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
index ee1b1aaa5..70e665b4c 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
@@ -37,19 +37,6 @@ class CfgMagazines
//Consumables: food, drinks etc.
#include "Consumables\Consumables.hpp"
- /*class 5Rnd_86x70_L115A1: CA_Magazine //.338 Lapua Magnum
- {
- scope = 2;
- displayName = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10;
- descriptionShort = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10_0;
- ammo=B_86x70_Ball_noTracer;
- count=5;
- initSpeed = 936; //TODO
- picture="\CA\weapons_BAF\data\UI\M_lrr_CA.paa";
- // descriptionShort = $STR_DSS_10RND_M107; TODO
- };*/
-
-
//EPOCH ADDITIONS
#include "VehicleAmmo.hpp"
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp
index a2a531e88..ec0d93590 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp
@@ -164,6 +164,7 @@ class FlareWhite_GP25: CA_Magazine {
scope = 2;
type = 16;
displayName = "$STR_DN_FLAREWHITE_GP25";
+ descriptionShort = "$str_dss_1rnd_flarewhite_gp25";
picture = "\Ca\weapons_E\Data\icons\M_GP25_white_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_gp_flare.p3d";
ammo = "F_40mm_White";
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp
index 742640bd0..4640e637b 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp
@@ -133,8 +133,17 @@ class Category_25 {
class SmokeShellGreen {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
class SmokeShellRed {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
class SmokeShellYellow {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+ class SmokeShellPurple {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+ class SmokeShellBlue {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+ class SmokeShellOrange {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
class 1Rnd_Smoke_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+ class 1Rnd_SmokeYellow_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+ class 1Rnd_SmokeGreen_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+ class 1Rnd_SmokeRed_M203 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
class 1Rnd_Smoke_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+ class 1Rnd_SmokeRed_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+ class 1Rnd_SmokeYellow_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
+ class 1Rnd_SmokeGreen_GP25 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
};
//Chem-lites/Flares
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 6b75b8d99..f2d0ff4bb 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -15101,6 +15101,17 @@
Kaliber: 7.62x51mm <br/>Naboje: 5 <br/>Używane w: M24, M40
Kaliber: 7.62x51mm <br/> Töltények: 5 <br/> Hozzá tartozó fegyver: M24, M40
+
+ Type: Flare <br/>Rounds: 1 <br/>Used in: GP-25 grenade launcher
+ Type: Fusée <br/>Munitions : 1 <br/>Utilisé avec : lance-grenades GP-25
+ Tipo: Bengala <br/>Cargas: 1 <br/>Uso: lanzagranadas GP-25
+ Tipo: Razzo luminoso <br/>Munizioni: 1 <br/>Si usa in: lanciagranate GP-25
+ Típus: Jelzőfény <br/> Lőszer: 1 <br/> Hozzá tartozó fegyver: GP-25 gránátvető
+ Typ: Flara <br/>Naboje: 1 <br/>Używane w: granatnik GP-25
+ Тип: сигнальная ракета <br/>Количество: 1 <br/>Используется в: ГП-25
+ Typ: Leuchtgeschoss <br/>Schuss: 1 <br/>Verwendet in: GP-25 Granatwerfer
+ Typ: světlice <br/>Nábojů: 1 <br/>Pro: granátomet GP-25
+