Cleanup for Release

we don't use the redryder source on here anymore
Remove identical lootPos comment
2025-12-13 19:52:38 +03:00 · 2016-11-30 13:12:50 -05:00 · 2016-11-30 12:17:06 -05:00 · 2016-11-30 11:58:35 -05:00 · 2016-11-30 11:58:29 -05:00 · 2016-11-30 11:55:20 -05:00
1133 changed files with 41720 additions and 47849 deletions
--- a/1.0.6.txt
+++ b/1.0.6.txt
@@ -1,34 +1,62 @@
-[NEW] Fully updated to DayZ 1.8.7 base @icomrade @ebaydayz
-[NEW] 1.8.7 attachments system, community weapons and buildable base objects
-[NEW] 1.8.7 journal and crafting menu are now functional (default 'J' key)
-[NEW] 1.8.7 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
-[NEW] 1.8.7 weapon switching system and hotkeys (1 = primary, 2 = pistol, 3 = melee)
-[NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf
-[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz
-[NEW] RedRyder BB Gun by @arma2WillRobinson
+[NEW] Fully updated to DayZ 1.8.8 base @icomrade @ebayShopper
+[NEW] 1.8.8 attachments, blood trails, community weapons, traps and tripwires
+[NEW] 1.8.8 journal and crafting menu are now functional (default 'J' key)
+[NEW] 1.8.8 spawn selection, set dayz_spawnselection = 1; in init.sqf to enable (Chernarus only)
+[NEW] 1.8.8 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
+[NEW] 1.8.8 weapon switching and hotkeys (1 = primary, 2 = pistol, 3 = melee (or rifle onBack if DZE_TwoPrimaries=2;))
+[NEW] Players can carry more than one primary (one hidden on back). See configVariables.sqf for details @icomrade
+[NEW] Many new configuration options are available for admins. See dayz_code\configVariables.sqf and mission\init.sqf for descriptions.
+[NEW] Optional rules feed on player login, set dayz_enableRules in init.sqf
+[NEW] Streamer mode is toggleable by player in game options. Setting enabled hides server water mark and rules feed. @ebayShopper
+[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebayShopper
+[NEW] Optional dark UI by @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ code fixes by @SplenectomY @icomrade #1622
+[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
+[NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
 [NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
-[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebaydayz
-[NEW] Autorun hotkey (0 = Toggle auto run) @ebaydayz
-[NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix
-[NEW] Auto login when a player joins the server, default 10 seconds, requires description.ext update in the mission (disable in description.ext by setting defValueParam1 = 31;) @icomrade
-[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable
-[NEW] Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable
-[NEW] Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable @ebaydayz
-[NEW] Match stick counting is disabled by default. Set dayz_matchboxCount = true; in init.sqf to enable @ebaydayz
-[NEW] Tool breaking is disabled by default. Set dayz_toolBreaking = true; in init.sqf to enable @ebaydayz
-[NEW] Water bottle breaking is disabled by default. Set dayz_waterBottleBreaking = true; in init.sqf to enable @ebaydayz
-[NEW] Dayz_townGenerator = true; in init.sqf can enable vanilla map junk in addition to Epoch DynamicDebris. Only works on Chernarus. @ebaydayz
-[NEW] DB Backup script. @RimBlock
-[NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
-[NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
-[NEW] UI Update - Graphical and code changes, enable using DZE_UI = "dark"; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/
+[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebayShopper
+[NEW] Autorun hotkey ('0' key)
+[NEW] Earplugs hotkey ('F1' key)
+[NEW] Group system ('F5' key) with database save. Settings available in configVariables.sqf. CommandBar and RadioProtocol spam are now disabled via config. @icomrade @ebayShopper
+[NEW] Snap building, use DZE_modularBuild = true; in init.sqf to enable. @raymix
+[NEW] Auto login when a player joins the server, default 10 seconds, requires mission update (disable in description.ext by setting defValueParam1 = 31;) @icomrade
+[NOTE] Auto login does not force a player who aborted from the game, back to the lobby, to login
+[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable.
+[NEW] Dayz_townGenerator = true; in init.sqf enables vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. @ebayShopper
+[NEW] Database backup script. See Server Files\Tools\. @RimBlock
 [NEW] Upgraded (_DZE1,2,3,4) ArmoredSUV and Kamaz classes are now available. #1518 #1538 @McKeighan
-[NEW] Added waves effect during stormy weather #974 @FramedYannick @ebaydayz
-[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebaydayz
+[NEW] Added increased waves during stormy weather #974 @FramedYannick @ebayShopper
+[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebayShopper
+[NEW] A much improved version of Zupa's Advanced Trading 2.1+ is now the default config trader menu, NOT COMPATIBLE WITH DATABASE TRADERS @icomrade @Windmolders 
+[NEW] With config based traders categories can be reused by setting the duplicate=#; value. # is the category number to copy. @ebayShopper
+[NEW] With config based traders upgraded vehicles can now be sold for the same price as their original. #1745 @oiad
+[NEW] With config based traders the buy or sell price of any item can be set to -1 to forbid the respective trading action. @icomrade
+[NEW] Gems are now treated as variable value currency (Advanced Trading only). Configure gem values using DZE_GemWorthArray =[]; See configVariables.sqf. @icomrade
+[NEW] Gem rarity is now configurable for mining using DZE_GemOccurance =[]; See configVariables.sqf. @icomrade
+[NEW] A Plot For Life v2.5+ by RimBlock is now included and enabled by default, see configVariables.sqf @RimBlock @icomrade
+[NEW] Build Vectors v4+ by Striker is now included, only enabled with Snap building. Note there is no option to turn off Vector Building with Snap Building enabled @strikerforce @icomrade
+[NEW] Door Management v3.0+ by Zupa is now included and enabled by default with variable DZE_doorManagement, see configVariables.sqf @DevZupa @Bruce-LXXVI @ebayShopper 
+[NEW] Plot Management v2.1+ by Zupa is now included and enabled by default with variable DZE_permanentPlot, see configVariables.sqf @DevZupa @Bruce-LXXVI @icomrade
+[NEW] Precise Base Building v1.0.5+ by Mikeeeyy is now included. @Mikeeeyy @icomrade @ebayShopper
+[NEW] You may toggle vehicle destruction effects to prevent damage from vehicle explosions (useful to prevent griefing from ramming) use DZE_NoVehicleExplosions = true; to enable #1198 @icomrade
+[NEW] Temperature factors are now configurable with DZE_TempVars see configVariables.sqf. @icomrade 
+[NEW] Weather effects are now configurable with DZE_WeatherVariables. See DynamicWeatherEffects.sqf for info on these values. @icomrade
+[NEW] Full height cinderblock wall kits are now in game, classname "full_cinder_wall_kit" #1172 @icomrade
+[NEW] You can exclude built items from the god mode base function using DZE_GodModeBaseExclude = []; which is an array of item classnames
+[NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf
+[NEW] More possible causes of death added to study body: fell, ran over, shot, melee, zombie @ebayShopper
+[NEW] Player-list no longer shows who's in lobby or ingame.
+[NEW] 35 new male clothing classes added. #1732 #1734 @AirWavesMan
+[NEW] Added new _DZ variants of BRDM2, AN2, HMMWV, Mi17 and Cessna classes with radar disabled. #1746 @AirWavesMan
+[NEW] Added SCAR Mk16 and Mk17 variants, L86 and AA12 to loot tables and traders. #1743 @AirWavesMan
+[NEW] Players can now manually push stuck planes backwards to free them. @ebayShopper
+[NEW] Salvage can now be disabled on locked vehicles via DZE_salvageLocked variable. #1757 @oiad
+[NEW] You may now rearm pooks and other helicopter, vehicle, pilot and driver weapons. @icomrade
+[NEW] Death messages now use a PVEH instead of the unreliable MPHit. Added localization, more causes of death, systemChat and dynamicText killfeed options. @ebayShopper
+[NEW] Parachute can now auto open at a set height during HALO jump. Altitude and speed meter can also be enabled. See configVariables.sqf. @ebayShopper
+[NEW] Added hatch, fold and ramp animation UserActions to ArmoredSUV, AH1Z, MV22 and UH1Y configs. @ebayShopper
+[NEW] VON in side and global is now blocked by default. See configVariables.sqf to change blocked VON channels. @icomrade @ebayShopper
+[NEW] Arma cheat input (LeftShift + NumPad-) is now blocked by default to prevent abuse of FPS cap and EndMission commands for duping. @icomrade

-[CHANGED] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt @ebaydayz
-[CHANGED] Several weapon, item and tool classnames changed. Admins see SQL\1.0.6_Updates @ebaydayz
-[CHANGED] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
 [CHANGED] Combattimeout now uses diag_tickTime instead of time.
 [CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
 [CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
@@ -36,53 +64,79 @@
 [CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
 [CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
 [CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x 
-[CHANGED] All instances of sleep replaced with the more reliable uiSleep @icomrade
+[CHANGED] All instances of sleep were replaced with the more reliable uiSleep where possible. @icomrade
 [CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade
-[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebaydayz
-[CHANGED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebaydayz
+[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebayShopper
+[CHANGED] With R3Fweight on overburdened players are now forced to move slowly instead of being knocked out. The scream was also removed. #1145 @icomrade @ebayShopper
+[CHANGED] Abort and respawn are now disabled immediately in the pause menu onLoad to compensate for low fps delay. @ebayShopper
+[CHANGED] Player_onPause is now customizable by admins along with the new unscheduled fn_pauseMenuChecks. #1340 @Rimblock @ebayShopper
+[CHANGED] Satchel charges, mines and launcher rounds now take one inventory slot instead of multiple for consistency with all other Epoch items. @ebayShopper

-[FIXED] Zombies now target and attack players correctly with 1.8.7 code
-[FIXED] Server position sync bug after falling unconscious #1522 @ebaydayz
+[FIXED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebayShopper
+[FIXED] Zombies now target and attack players far more accurately than in 1.0.5.1.
+[FIXED] Server position sync bug after falling unconscious. Fixes AI on server not seeing the player after knock out and position revert after relog. #1522 @ebayShopper
+[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebayShopper #1613
+[FIXED] Character sometimes failing to sync after changing clothes #1545
 [FIXED] Backpack wipes when changing clothes. #1361 @icomrade
 [FIXED] CH53 gear when locked #1364 @icomrade
 [FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
 [FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
 [FIXED] Crossbow quivers not working #1355 @icomrade
 [FIXED] Crash_spawner & Supply_drop modules spawning inaccessible loot piles #1408 #1390 @Uro1
-[FIXED] Fire cleanup diag_log error in server_functions.sqf #1421 @ebaydayz
-[FIXED] NearestObjects position error in server_playerSync.sqf #1425 @ebaydayz
+[FIXED] Several script errors in dayz_server #1421 #1425 @ebayShopper
 [FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
-[FIXED] Some counts reverted to forEach. Count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
 [FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
 [FIXED] Eating while inside a vehicle did not drop empty can  @deadeye2
 [FIXED] Zombie loot error when using loot tables in mission file  @deadeye2
-[FIXED] Trader menu expected array error #1618-1620 @ebaydayz
+[FIXED] Trader menu expected array error #1618-1620 @ebayShopper
 [FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
 [FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu
-[FIXED] Copy key failing when player doesn't have a backpack @ebaydayz
-[FIXED] DarkUI hunger and thirst inconsistency with vanilla UI and health system @SplenectomY @icomrade #1622
+[FIXED] Copy key failing when player doesn't have a backpack @ebayShopper
 [FIXED] Fire barrels not being detected over water @pj999 @icomrade #1559 #1564
 [FIXED] Opening supply crates over water no longer drops the items on the sea floor @pj999 @icomrade #1558
 [FIXED] Plot pole required message not updating to reflect DZE_PlotPole radius @mathewjknott @icomrade #1274
 [FIXED] Slow login timer and incorrect loading screen message when login times out @icomrade
-[FIXED] Combine mags not working for Revolver and M1911 ammo @Terrien @ebaydayz #1313
-[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebaydayz #1514
+[FIXED] Combine mags not working for Revolver and M1911 ammo @Terrien @ebayShopper #1313
+[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebayShopper #1514
 [FIXED] Smoke countermeasures are now visible @Markokil321 @icomrade #1440
-[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebaydayz #1613
-[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebaydayz #1599
-[FIXED] Safes and lockboxes wiped when opening after restart and locking not being logged to RPT @ebaydayz #1413 #1503
-[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts @ebaydayz #1504
-[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebaydayz
-[FIXED] Reworked death messages. Fixed messages not always showing, undefined errors and wrong distance bug. Added bled out, killed by zombie, etc. MPHit event handler (fnc_plyrHit) is no longer needed. @ebaydayz
-[FIXED] Player no longer hears radiation sound when changing clothes. @ebaydayz
+[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebayShopper #1599
+[FIXED] Safes and lockboxes occasionally wiped when opening after restart and locking not being logged to RPT @ebayShopper #1413 #1503
+[FIXED] Greatly optimized safe gear handling. Safe inventories are no longer sent to all machines over the network on server startup and each lock. @ebayShopper
+[FIXED] Common duping methods exploiting safes no longer work with the new safe gear handling code. #1341 @RimBlock @ebayShopper
+[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts. @icomrade #1504
+[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebayShopper
+[FIXED] Player no longer hears radiation sound when changing clothes. @ebayShopper
+[FIXED] Ponds and lakes are now detected correctly in player_goFishing and player_drinkWater. #1678 @ebayShopper
+[FIXED] Players are now ejected and force killed when their vehicle is destroyed. This applies to all vehicles except cars. Cars eject, but do not force kill. @icomrade
+[NOTE]	Servers that use safezones must configure DZE_SafeZonePosArray, otherwise passengers of vehicles in safezones will be killed on destruction of their vehicle. See configVariables.sqf.
+[FIXED] Players are no longer able to brute force doors or safes by the method described in #1187 @icomrade
+[FIXED] Some buildables not displaying removal option #1135 @icomrade
+[FIXED] Study body message saying his/he on female players. @ebayShopper
+[FIXED] Destroyed ore veins and ammo crates are now deleted globally after being removed. #1730 @icomrade
+[FIXED] UH1Y and AH6X unknown animation source RPT errors. Added back observer seats to AH6X and UH1Y without thermal imaging. @icomrade
+[FIXED] Players can no longer relog over bases in a helicopter, parachute or plane to get inside. @ebayShopper
+[FIXED] Mozzie helicopter noises, and crashed mozzies bouncing into orbit. @icomrade
+[FIXED] Firing from vehicles puts you in combat now. @icomrade
+[FIXED] Players will no longer end up swimming in the ground after spawn, relog or clothes change on maps with respawn_west in the water. @ebayShopper
+[FIXED] It is no longer possible to drag players through base walls when they are unconscious. @icomrade
+[FIXED] Purchased vehicles should no longer spawn inside each other on trader helipads. @icomrade
+[FIXED] Humanity hit is now applied correctly to players shooting from vehicles. @ebayShopper
+[FIXED] Chopped down trees are now synced for JIP players, so they no longer respawn on relog. @ebayShopper
+[FIXED] Several errors with loading and unloading unconscious players from vehicles. @oiad @ebayShopper
+[FIXED] Occasional glitch death when opening parachute during HALO jump. @ebayShopper

-[UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1
+[UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
 [UPDATED] .bat files updated in Config-Examples @Raziel23x
 [UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
-[UPDATED] Epoch.sql, 1.0.5_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+[UPDATED] Epoch.sql, 1.0.6_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1

-[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
-[INFO] Auto login does not force a player who aborted from the game, back to the lobby, to login
-[INFO] (EXTREMELY IMPORTANT) Server owners MUST update their required build and beta to 131129
+[INFO] Server owners must update to the new Hive DLL included in the 1.0.6 release, changes in the source code can be found here: https://github.com/vbawol/DayZhiveEpoch/pull/13
+[INFO] Many weapon and item classnames changed. Admins must update their traders. See SQL\1.0.6_Updates and dayz_code\Configs\CfgServerTrader
+[INFO] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt
+[INFO] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
+[INFO] If you use any community mods included in this release (AdvancedTrading, BuildVectors, Door/PlotManagement, SnapBuild, PlotForLife, PreciseBuilding, DZGM, etc.) you MUST uninstall them from your mission. They have been improved and many bugs have been fixed. Get updated copies from https://github.com/EpochModTeam/DayZ-Epoch
+[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) are confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
+[INFO] Server owners and players should use the stable branch of ArmA 2 OA
+[INFO] The A2OA Linux server version is 1.63.130836 at the time of release. Until it is updated with the core patch fixes Linux server admins will need to patch their mission:  https://github.com/DayZMod/DayZ/issues/732
 [INFO] Models/textures by Paul Tomany. @Sequisha.
 [INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/Documents/1.0.6
+++ b/Documents/1.0.6
@@ -6,7 +6,8 @@
 	- DZE_getModelName --> fn_getModelName
 	- fnc_usec_playerBleed --> fnc_usec_playerHandleBlood
 	- object_handleServerKilled --> vehicle_handleServerKilled
-	- object_setFixServer --> fnc_veh_setFixServer 
+	- object_setFixServer --> fnc_veh_setFixServer
+	- server_timeSync --> sched_sync (moved to scheduler)
 	- vehicle_handleDamage --> fnc_veh_handleDam
 	- vehicle_handleKilled -->  fnc_veh_handleKilled
 	
@@ -14,13 +15,20 @@
 	- dayz_allowedObjects --> DayZ_SafeObjects
 	- dayz_CLBase --> dz_loot_groups (similar not identical)
 	- dayz_CLChances --> dz_loot_weighted (similar not identical)
-	- dayz_combat --> no longer exists use (player getVariable["combattimeout",0] >= diag_tickTime)
+	- dayz_combat --> no longer exists use (player getVariable["inCombat",false])
 	- dayz_fullMoonNights --> dayz_ForcefullmoonNights
+	- dayz_MapArea --> no longer exists (was only used for DynamicVehicleArea and HeliCrashArea)
+	- dayz_sellDistance_vehicle, dayz_sellDistance_boat, dayz_sellDistance_air --> Z_VehicleDistance
 	- dayz_updateObjects --> DayZ_GearedObjects
+	- DynamicVehicleArea --> (getMarkerSize "center") select 1
+	- DZE_ActionInProgress --> dayz_actionInProgress
 	- DZE_CanPickup --> canPickup
 	- DZE_trees --> dayz_trees
 	- freeTarget --> OpenTarget
+	- HeliCrashArea --> (getMarkerSize "crashsites") select 1
 	- PVDZE_serverObjectMonitor --> dayz_serverObjectMonitor
+	- r_action_count --> dayz_actionInProgress (now true/false instead of 1/0)
+	- selfTransfusionTime --> player getVariable ["LastTransfusion",-(DZE_selfTransfuse_Values select 2)]
 	
 - Duplicate public variables have been renamed:
 	- dayzPlayerLogin --> PVCDZ_plr_Login
@@ -38,7 +46,7 @@
 	- PVDZE_plr_Login --> PVDZ_plr_Login1
 	- PVDZE_plr_Login2 --> PVDZ_plr_Login2
 	- PVDZE_plr_LoginRecord --> PVDZ_plr_LoginRecord
-	- PVDZE_plr_Save --> PVDZ_plr_Save
+	- PVDZE_plr_Save --> PVDZ_plr_Save  Note: 2nd param is now a nested array (was array) 4th param is now achievements array (was bool)
 	- PVDZE_plr_SetDate --> dayzSetDate
 	- PVDZE_send --> PVDZ_send
 	- PVDZE_Server_Simulation --> PVDZ_Server_Simulation
@@ -53,4 +61,4 @@
 	- usecEpi --> PVCDZ_hlt_Epi
 	- usecMorphine --> PVCDZ_hlt_Morphine
 	- usecPainK --> PVCDZ_hlt_PainK
-	- usecTransfuse --> PVCDZ_hlt_Transfuse
+	- usecTransfuse --> PVCDZ_hlt_Transfuse
--- a/Documents/CHANGE
+++ b/Documents/CHANGE
@@ -0,0 +1,142 @@
+[NEW] Fully updated to DayZ 1.8.8 base @icomrade @ebayShopper
+[NEW] 1.8.8 attachments, blood trails, community weapons, traps and tripwires
+[NEW] 1.8.8 journal and crafting menu are now functional (default 'J' key)
+[NEW] 1.8.8 spawn selection, set dayz_spawnselection = 1; in init.sqf to enable (Chernarus only)
+[NEW] 1.8.8 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
+[NEW] 1.8.8 weapon switching and hotkeys (1 = primary, 2 = pistol, 3 = melee (or rifle onBack if DZE_TwoPrimaries=2;))
+[NEW] Players can carry more than one primary (one hidden on back). See configVariables.sqf for details @icomrade
+[NEW] Many new configuration options are available for admins. See dayz_code\configVariables.sqf and mission\init.sqf for descriptions.
+[NEW] Optional rules feed on player login, set dayz_enableRules in init.sqf
+[NEW] Streamer mode is toggleable by player in game options. Setting enabled hides server water mark and rules feed. @ebayShopper
+[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebayShopper
+[NEW] Optional dark UI by @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ code fixes by @SplenectomY @icomrade #1622
+[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
+[NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
+[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
+[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebayShopper
+[NEW] Autorun hotkey ('0' key)
+[NEW] Earplugs hotkey ('F1' key)
+[NEW] Group system ('F5' key) with database save. Settings available in configVariables.sqf. CommandBar and RadioProtocol spam are now disabled via config. @icomrade @ebayShopper
+[NEW] Snap building, use DZE_modularBuild = true; in init.sqf to enable. @raymix
+[NEW] Auto login when a player joins the server, default 10 seconds, requires mission update (disable in description.ext by setting defValueParam1 = 31;) @icomrade
+[NOTE] Auto login does not force a player who aborted from the game, back to the lobby, to login
+[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable.
+[NEW] Dayz_townGenerator = true; in init.sqf enables vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. @ebayShopper
+[NEW] Database backup script. See Server Files\Tools\. @RimBlock
+[NEW] Upgraded (_DZE1,2,3,4) ArmoredSUV and Kamaz classes are now available. #1518 #1538 @McKeighan
+[NEW] Added increased waves during stormy weather #974 @FramedYannick @ebayShopper
+[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebayShopper
+[NEW] A much improved version of Zupa's Advanced Trading 2.1+ is now the default config trader menu, NOT COMPATIBLE WITH DATABASE TRADERS @icomrade @Windmolders 
+[NEW] With config based traders categories can be reused by setting the duplicate=#; value. # is the category number to copy. @ebayShopper
+[NEW] With config based traders upgraded vehicles can now be sold for the same price as their original. #1745 @oiad
+[NEW] With config based traders the buy or sell price of any item can be set to -1 to forbid the respective trading action. @icomrade
+[NEW] Gems are now treated as variable value currency (Advanced Trading only). Configure gem values using DZE_GemWorthArray =[]; See configVariables.sqf. @icomrade
+[NEW] Gem rarity is now configurable for mining using DZE_GemOccurance =[]; See configVariables.sqf. @icomrade
+[NEW] A Plot For Life v2.5+ by RimBlock is now included and enabled by default, see configVariables.sqf @RimBlock @icomrade
+[NEW] Build Vectors v4+ by Striker is now included, only enabled with Snap building. Note there is no option to turn off Vector Building with Snap Building enabled @strikerforce @icomrade
+[NEW] Door Management v3.0+ by Zupa is now included and enabled by default with variable DZE_doorManagement, see configVariables.sqf @DevZupa @Bruce-LXXVI @ebayShopper 
+[NEW] Plot Management v2.1+ by Zupa is now included and enabled by default with variable DZE_permanentPlot, see configVariables.sqf @DevZupa @Bruce-LXXVI @icomrade
+[NEW] Precise Base Building v1.0.5+ by Mikeeeyy is now included. @Mikeeeyy @icomrade @ebayShopper
+[NEW] You may toggle vehicle destruction effects to prevent damage from vehicle explosions (useful to prevent griefing from ramming) use DZE_NoVehicleExplosions = true; to enable #1198 @icomrade
+[NEW] Temperature factors are now configurable with DZE_TempVars see configVariables.sqf. @icomrade 
+[NEW] Weather effects are now configurable with DZE_WeatherVariables. See DynamicWeatherEffects.sqf for info on these values. @icomrade
+[NEW] Full height cinderblock wall kits are now in game, classname "full_cinder_wall_kit" #1172 @icomrade
+[NEW] You can exclude built items from the god mode base function using DZE_GodModeBaseExclude = []; which is an array of item classnames
+[NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf
+[NEW] More possible causes of death added to study body: fell, ran over, shot, melee, zombie @ebayShopper
+[NEW] Player-list no longer shows who's in lobby or ingame.
+[NEW] 35 new male clothing classes added. #1732 #1734 @AirWavesMan
+[NEW] Added new _DZ variants of BRDM2, AN2, HMMWV, Mi17 and Cessna classes with radar disabled. #1746 @AirWavesMan
+[NEW] Added SCAR Mk16 and Mk17 variants, L86 and AA12 to loot tables and traders. #1743 @AirWavesMan
+[NEW] Players can now manually push stuck planes backwards to free them. @ebayShopper
+[NEW] Salvage can now be disabled on locked vehicles via DZE_salvageLocked variable. #1757 @oiad
+[NEW] You may now rearm pooks and other helicopter, vehicle, pilot and driver weapons. @icomrade
+[NEW] Death messages now use a PVEH instead of the unreliable MPHit. Added localization, more causes of death, systemChat and dynamicText killfeed options. @ebayShopper
+[NEW] Parachute can now auto open at a set height during HALO jump. Altitude and speed meter can also be enabled. See configVariables.sqf. @ebayShopper
+[NEW] Added hatch, fold and ramp animation UserActions to ArmoredSUV, AH1Z, MV22 and UH1Y configs. @ebayShopper
+[NEW] VON in side and global is now blocked by default. See configVariables.sqf to change blocked VON channels. @icomrade @ebayShopper
+[NEW] Arma cheat input (LeftShift + NumPad-) is now blocked by default to prevent abuse of FPS cap and EndMission commands for duping. @icomrade
+
+[CHANGED] Combattimeout now uses diag_tickTime instead of time.
+[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
+[CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
+[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
+[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
+[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
+[CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x 
+[CHANGED] All instances of sleep were replaced with the more reliable uiSleep where possible. @icomrade
+[CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade
+[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebayShopper
+[CHANGED] With R3Fweight on overburdened players are now forced to move slowly instead of being knocked out. The scream was also removed. #1145 @icomrade @ebayShopper
+[CHANGED] Abort and respawn are now disabled immediately in the pause menu onLoad to compensate for low fps delay. @ebayShopper
+[CHANGED] Player_onPause is now customizable by admins along with the new unscheduled fn_pauseMenuChecks. #1340 @Rimblock @ebayShopper
+[CHANGED] Satchel charges, mines and launcher rounds now take one inventory slot instead of multiple for consistency with all other Epoch items. @ebayShopper
+
+[FIXED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebayShopper
+[FIXED] Zombies now target and attack players far more accurately than in 1.0.5.1.
+[FIXED] Server position sync bug after falling unconscious. Fixes AI on server not seeing the player after knock out and position revert after relog. #1522 @ebayShopper
+[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebayShopper #1613
+[FIXED] Character sometimes failing to sync after changing clothes #1545
+[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
+[FIXED] CH53 gear when locked #1364 @icomrade
+[FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
+[FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
+[FIXED] Crossbow quivers not working #1355 @icomrade
+[FIXED] Crash_spawner & Supply_drop modules spawning inaccessible loot piles #1408 #1390 @Uro1
+[FIXED] Several script errors in dayz_server #1421 #1425 @ebayShopper
+[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
+[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
+[FIXED] Eating while inside a vehicle did not drop empty can  @deadeye2
+[FIXED] Zombie loot error when using loot tables in mission file  @deadeye2
+[FIXED] Trader menu expected array error #1618-1620 @ebayShopper
+[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
+[FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu
+[FIXED] Copy key failing when player doesn't have a backpack @ebayShopper
+[FIXED] Fire barrels not being detected over water @pj999 @icomrade #1559 #1564
+[FIXED] Opening supply crates over water no longer drops the items on the sea floor @pj999 @icomrade #1558
+[FIXED] Plot pole required message not updating to reflect DZE_PlotPole radius @mathewjknott @icomrade #1274
+[FIXED] Slow login timer and incorrect loading screen message when login times out @icomrade
+[FIXED] Combine mags not working for Revolver and M1911 ammo @Terrien @ebayShopper #1313
+[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebayShopper #1514
+[FIXED] Smoke countermeasures are now visible @Markokil321 @icomrade #1440
+[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebayShopper #1599
+[FIXED] Safes and lockboxes occasionally wiped when opening after restart and locking not being logged to RPT @ebayShopper #1413 #1503
+[FIXED] Greatly optimized safe gear handling. Safe inventories are no longer sent to all machines over the network on server startup and each lock. @ebayShopper
+[FIXED] Common duping methods exploiting safes no longer work with the new safe gear handling code. #1341 @RimBlock @ebayShopper
+[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts. @icomrade #1504
+[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebayShopper
+[FIXED] Player no longer hears radiation sound when changing clothes. @ebayShopper
+[FIXED] Ponds and lakes are now detected correctly in player_goFishing and player_drinkWater. #1678 @ebayShopper
+[FIXED] Players are now ejected and force killed when their vehicle is destroyed. This applies to all vehicles except cars. Cars eject, but do not force kill. @icomrade
+[NOTE]	Servers that use safezones must configure DZE_SafeZonePosArray, otherwise passengers of vehicles in safezones will be killed on destruction of their vehicle. See configVariables.sqf.
+[FIXED] Players are no longer able to brute force doors or safes by the method described in #1187 @icomrade
+[FIXED] Some buildables not displaying removal option #1135 @icomrade
+[FIXED] Study body message saying his/he on female players. @ebayShopper
+[FIXED] Destroyed ore veins and ammo crates are now deleted globally after being removed. #1730 @icomrade
+[FIXED] UH1Y and AH6X unknown animation source RPT errors. Added back observer seats to AH6X and UH1Y without thermal imaging. @icomrade
+[FIXED] Players can no longer relog over bases in a helicopter, parachute or plane to get inside. @ebayShopper
+[FIXED] Mozzie helicopter noises, and crashed mozzies bouncing into orbit. @icomrade
+[FIXED] Firing from vehicles puts you in combat now. @icomrade
+[FIXED] Players will no longer end up swimming in the ground after spawn, relog or clothes change on maps with respawn_west in the water. @ebayShopper
+[FIXED] It is no longer possible to drag players through base walls when they are unconscious. @icomrade
+[FIXED] Purchased vehicles should no longer spawn inside each other on trader helipads. @icomrade
+[FIXED] Humanity hit is now applied correctly to players shooting from vehicles. @ebayShopper
+[FIXED] Chopped down trees are now synced for JIP players, so they no longer respawn on relog. @ebayShopper
+[FIXED] Several errors with loading and unloading unconscious players from vehicles. @oiad @ebayShopper
+[FIXED] Occasional glitch death when opening parachute during HALO jump. @ebayShopper
+
+[UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
+[UPDATED] .bat files updated in Config-Examples @Raziel23x
+[UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
+[UPDATED] Epoch.sql, 1.0.6_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+
+[INFO] Server owners must update to the new Hive DLL included in the 1.0.6 release, changes in the source code can be found here: https://github.com/vbawol/DayZhiveEpoch/pull/13
+[INFO] Many weapon and item classnames changed. Admins must update their traders. See SQL\1.0.6_Updates and dayz_code\Configs\CfgServerTrader
+[INFO] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt
+[INFO] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
+[INFO] If you use any community mods included in this release (AdvancedTrading, BuildVectors, Door/PlotManagement, SnapBuild, PlotForLife, PreciseBuilding, DZGM, etc.) you MUST uninstall them from your mission. They have been improved and many bugs have been fixed. Get updated copies from https://github.com/EpochModTeam/DayZ-Epoch
+[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) are confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
+[INFO] Server owners and players should use the stable branch of ArmA 2 OA
+[INFO] The A2OA Linux server version is 1.63.130836 at the time of release. Until it is updated with the core patch fixes Linux server admins will need to patch their mission:  https://github.com/DayZMod/DayZ/issues/732
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ http://dayzepoch.com

 Based on DayZ Mod Community edition

-https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md
+https://github.com/DayZMod/DayZ/blob/1.8.8/Documentation/Credits.md
 http://dayzmod.com 


@@ -28,6 +28,8 @@ Included Custom Addons
 * Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
 * USEC CH53 by Rocket - http://dayz.com
 * More enterable buildings - Dayzero - https://zombies.nu/
+* Anzio 20mm Rifle by WillRobinson - http://www.armaholic.com/page.php?id=30175
+* RedRyder BB Gun by WillRobinson - https://github.com/arma2WillRobinson/Red-Ryder

 --------------------------
 Included Custom Islands
@@ -59,8 +61,10 @@ GitHub Collaborators (In order of most commits)
 * dayz10k - https://github.com/dayz10k
 * Skaronator - https://github.com/Skaronator
 * icomrade - https://github.com/icomrade
+* ebayShopper - https://github.com/ebayShopper
 * Axles - https://github.com/Axles
 * Armifer - https://github.com/Armifer
+* Zupa - https://github.com/Windmolders

 --------------------------
 GitHub Contributors (In order of most commits)
@@ -74,12 +78,19 @@ GitHub Contributors (In order of most commits)
 * zabn - https://github.com/zabn
 * eltexonline - https://github.com/eltexonline
 * icomrade - https://github.com/icomrade
+* ebayShopper - https://github.com/ebayShopper
 * Namindu - https://github.com/Namindu
 * raginruffalo - https://github.com/raginruffalo
+* Markokil321 - https://github.com/Markokil321
+* Mikeeeyy - https://github.com/Mikeeeyy
 * Adaptivity - https://github.com/Adaptivity
+* RimBlock - https://github.com/RimBlock
+* raymix - https://github.com/raymix
+* arma2WillRobinson - https://github.com/arma2WillRobinson
 * facoptere - https://github.com/facoptere
 * ctcDNightmare - https://github.com/ctcDNightmare
 * SGanthony - https://github.com/SGanthony
+* githubmil - https://github.com/githubmil
 * Geodar - https://github.com/Geodar
 * Sandbird - https://github.com/Sandbird
 * krazey - https://github.com/krazey
@@ -96,7 +107,11 @@ GitHub Contributors (In order of most commits)
 * nahkiss - https://github.com/nahkiss
 * BlackLA - https://github.com/BlackLA
 * Hogscraper - https://github.com/hogscraper
+* Bruce-LXXVI - https://github.com/Bruce-LXXVI
+* oiad - https://github.com/oiad
+* AirwavesMan - https://github.com/AirwavesMan
 * Raziel23x - https://github.com/Raziel23x
+* strikerforce - https://github.com/strikerforce

 --------------------------
 Special thanks
--- a/SQF/dayz_anim/weapon/saw_idle.rtm
+++ b/SQF/dayz_anim/weapon/saw_idle.rtm
--- a/SQF/dayz_code/Configs/CfgArma.hpp
+++ b/SQF/dayz_code/Configs/CfgArma.hpp
@@ -26,6 +26,7 @@ class CfgActions {
 	class DropMagazine : None { show = 0; };
 	class PutMagazine : None { show = 0; };
 	class DeactivateMine : None { show = 0; };
+	class RepairVehicle: None { show = 0; };
 /*
 "None"
 "GetInCommander"
@@ -265,6 +266,171 @@ class CfgInGameUI
 			};
 		};
 	};
+	// Hide group hotbar
+	class CommandBar {
+		left = "-0.032 + SafeZoneX";
+		top = "(SafeZoneH + SafeZoneY) - (1 - 0.851)";
+		width = 0;
+		height = 0;
+		imageDefaultWeapons = "ca\ui\data\clear_empty.paa";
+		imageNoWeapons = "ca\ui\data\clear_empty.paa";
+		imageCommander = "ca\ui\data\clear_empty.paa";
+		imageDriver = "ca\ui\data\clear_empty.paa";
+		imageGunner = "ca\ui\data\clear_empty.paa";
+		imageCargo = "ca\ui\data\clear_empty.paa";
+		dimm = 0.3;
+		colorRedTeam[] = {0,0,0,0};
+		colorBlueTeam[] = {0,0,0,0};
+		colorGreenTeam[] = {0,0,0,0};
+		colorYellowTeam[] = {0,0,0,0};
+		colorWhiteTeam[] = {0,0,0,0};	
+		class prevPage {
+			x = 0;
+			y = 0;
+			w = 0;
+			h = 0;
+			color[] = {0,0,0,0};
+			texture = "ca\ui\data\clear_empty.paa";
+		};	
+		class nextPage {
+			x = 0;
+			y = 0;
+			w = 0;
+			h = 0;
+			color[] = {0,0,0,0};
+			texture = "ca\ui\data\clear_empty.paa";
+		};
+		class UnitInfo {
+			class GroupIcon {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+			};
+			class HcGroupText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class UnitBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				textureNormal = "ca\ui\data\clear_empty.paa";
+				textureSelected = "ca\ui\data\clear_empty.paa";
+				texturePlayer = "ca\ui\data\clear_empty.paa";
+				textureFocus = "ca\ui\data\clear_empty.paa";
+			};
+			class UnitFocus {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class UnitIcon {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				colorPlayer[] = {0,0,0,0};
+				colorNoAmmo[] = {0,0,0,0};
+				colorWounded[] = {0,0,0,0};
+				colorWoundedFade[] = {0,0,0,0};
+				colorNoFuel[] = {0,0,0,0};
+			};
+			class Semaphore {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class CommandBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class CommandText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class UnitSpecialRole {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+			};
+			class VehicleNumberBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class VehicleNumberText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				colorText[] = {0,0,0,0};
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class UnitRole {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+			};
+			class UnitNumberBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class UnitNumberText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				colorText[] = {0,0,0,0};
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class CombatMode {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				textureMCareless = "ca\ui\data\clear_empty.paa";
+				textureMSafe = "ca\ui\data\clear_empty.paa";
+				textureMAware = "ca\ui\data\clear_empty.paa";
+				textureMCombat = "ca\ui\data\clear_empty.paa";
+				textureMStealth = "ca\ui\data\clear_empty.paa";
+			};
+		};
+	};
 };

 class CfgVoice {
@@ -280,15 +446,7 @@ class CfgIdentities {
 	class PZombie1
 	{
 		name = "PZombie";
-		face = "PZombie1";
-		glasses = "None";
-		speaker = "NoVoice";
-		pitch = 1;
-	};
-	class PZombie2
-	{
-		name = "PZombie";
-		face = "PZombie2";
+		face = "PZombieFace1";
 		glasses = "None";
 		speaker = "NoVoice";
 		pitch = 1;
@@ -376,11 +534,10 @@ class CfgSurvival {
 			rawfoodtype = "FoodchickenRaw";
 		};
 		class Cock: Hen {};
-		class DZ_Fin: Default {
-			yield = 0;
+		class Fin: Default {
 			rawfoodtype = "FoodDogRaw";
 		};
-		class DZ_Pastor: DZ_Fin {};
+		class Pastor: Fin {};
 		class Rabbit: Default {
 			yield = 2;
 			rawfoodtype = "FoodrabbitRaw";
@@ -613,5 +770,146 @@ class CfgSurvival {
 			sex = "male";
 			playerModel = "INS_Worker2_DZ";
 		};
+		//new Epoch 1.06
+		class Skin_USMC_Soldier_Officer_DZ: Default {
+			sex = "male";
+			playerModel = "USMC_Soldier_Officer_DZ";
+		};
+		class Skin_USMC_Soldier_MG_DZ: Default {
+			sex = "male";
+			playerModel = "USMC_Soldier_MG_DZ";
+		};
+		class Skin_USMC_Soldier_Pilot_DZ: Default {
+			sex = "male";
+			playerModel = "USMC_Soldier_Pilot_DZ";
+		};
+		class Skin_FR_TL_DZ: Default {
+			sex = "male";
+			playerModel = "FR_TL_DZ";
+		};
+		class Skin_FR_R_DZ: Default {
+			sex = "male";
+			playerModel = "FR_R_DZ";
+		};
+		class Skin_FR_Marksman_DZ: Default {
+			sex = "male";
+			playerModel = "FR_Marksman_DZ";
+		};
+		class Skin_FR_Assault_R_DZ: Default {
+			sex = "male";
+			playerModel = "FR_Assault_R_DZ";
+		};
+		class Skin_RU_Soldier_DZ: Default {
+			sex = "male";
+			playerModel = "RU_Soldier_DZ";
+		};
+		class Skin_RU_Soldier_Officer_DZ: Default {
+			sex = "male";
+			playerModel = "RU_Soldier_Officer_DZ";
+		};
+		class Skin_RUS_Soldier1_DZ: Default {
+			sex = "male";
+			playerModel = "RUS_Soldier1_DZ";
+		};
+		class Skin_RUS_Commander_DZ: Default {
+			sex = "male";
+			playerModel = "RUS_Commander_DZ";
+		};
+		class Skin_MVD_Soldier_DZ: Default {
+			sex = "male";
+			playerModel = "MVD_Soldier_DZ";
+		};
+		class Skin_Ins_Soldier_2_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Soldier_2_DZ";
+		};
+		class Skin_Ins_Commander_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Commander_DZ";
+		};
+		class Skin_Ins_Soldier_Crew_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Soldier_Crew_DZ";
+		};
+		class Skin_CDF_Soldier_DZ: Default {
+			sex = "male";
+			playerModel = "CDF_Soldier_DZ";
+		};
+		class Skin_Doctor_DZ: Default {
+			sex = "male";
+			playerModel = "Doctor_DZ";
+		};
+		class Skin_Assistant_DZ: Default {
+			sex = "male";
+			playerModel = "Assistant_DZ";
+		};
+		class Skin_Worker1_DZ: Default {
+			sex = "male";
+			playerModel = "Worker1_DZ";
+		};
+		class Skin_Worker3_DZ: Default {
+			sex = "male";
+			playerModel = "Worker3_DZ";
+		};
+		class Skin_Worker4_DZ: Default {
+			sex = "male";
+			playerModel = "Worker4_DZ";
+		};
+		class Skin_TK_CIV_Takistani01_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani01_EP1_DZ";
+		};
+		class Skin_TK_CIV_Takistani03_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani03_EP1_DZ";
+		};
+		class Skin_TK_CIV_Takistani04_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani04_EP1_DZ";
+		};
+		class Skin_TK_CIV_Takistani06_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani06_EP1_DZ";
+		};
+		class Skin_TK_INS_Soldier_AR_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_INS_Soldier_AR_EP1_DZ";
+		};
+		class Skin_TK_GUE_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_GUE_Soldier_EP1_DZ";
+		};
+		class Skin_CZ_Soldier_SL_DES_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "CZ_Soldier_SL_DES_EP1_DZ";
+		};
+		class Skin_US_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "US_Soldier_EP1_DZ";
+		};
+		class Skin_UN_CDF_Soldier_Guard_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "UN_CDF_Soldier_Guard_EP1_DZ";
+		};
+		class Skin_UN_CDF_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "UN_CDF_Soldier_EP1_DZ";
+		};
+		class Skin_GER_Soldier_TL_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "GER_Soldier_TL_EP1_DZ";
+		};
+		class Skin_BAF_Soldier_Officer_MTP_DZ: Default {
+			sex = "male";
+			playerModel = "BAF_Soldier_Officer_MTP_DZ";
+		};
+		class Skin_BAF_Soldier_N_MTP_DZ: Default {
+			sex = "male";
+			playerModel = "BAF_Soldier_N_MTP_DZ";
+		};
+		class Skin_FR_Sapper_DZ: Default {
+			sex = "male";
+			playerModel = "FR_Sapper_DZ";
+		};
 	};
 };
--- a/SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp
+++ b/SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp
@@ -7,7 +7,7 @@ class Wooden_Arrow : Recipe {
 	};
 	output[] = 
 	{
-		{"WoodenArrow","CfgMagazines",4}
+		{"1Rnd_Arrow_Wood","CfgMagazines",4}
 	};
 	required[] = 
 	{
--- a/SQF/dayz_code/Configs/CfgCrafting/Recipes/Medical/woodensplint.hpp
+++ b/SQF/dayz_code/Configs/CfgCrafting/Recipes/Medical/woodensplint.hpp
@@ -2,12 +2,13 @@ class Blueprint_woodensplint : Recipe {
 	displayName = $STR_ITEM_NAME_WOODENSPLINT;
 	input[] = 
 	{
-		{"PartWoodPile","CfgMagazines",2},
-		{"equip_string","CfgMagazines",1}
+		{"ItemPlank","CfgMagazines",1},
+		{"equip_string","CfgMagazines",1},
+		{"equip_duct_tape","CfgMagazines",1}
 	};
 	output[] = 
 	{
-		{"equip_woodensplint","CfgMagazines",2}
+		{"equip_woodensplint","CfgMagazines",1} // Only need one splint to fix legs
 	};
 	required[] = 
 	{
--- a/SQF/dayz_code/Configs/CfgCrafting/Recipes/Other/nails.hpp
+++ b/SQF/dayz_code/Configs/CfgCrafting/Recipes/Other/nails.hpp
@@ -6,7 +6,7 @@ class Blueprint_nails : Recipe {
 	};
 	output[] = 
 	{
-		{"equip_nails","CfgMagazines",10}
+		{"equip_nails","CfgMagazines",4}
 	};
 	required[] = 
 	{
--- a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
+++ b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
@@ -2,7 +2,6 @@
 Created by Raymix
 */

-
 class SnapBuilding {
 	//Barriers whitelist
 	class Barrier {
@@ -12,11 +11,14 @@ class SnapBuilding {
 			"Land_HBarrier1_DZ",
 			"Sandbag1_DZ",
 			"BagFenceRound_DZ",
-			"Fort_RazorWire"
+			"Fort_RazorWire",
+			"WoodFloorQuarter_DZ",
+			"WoodFloorHalf_DZ",
+			"WoodFloor_DZ",	
+			"MetalFloor_DZ"
 		};
 		radius = 5;
 	};
-	//snap points
 	class Land_HBarrier5Preview: Barrier{ //fix for broken offsets in ghost
 		points[] = {
 		{0,0,0,"Pivot"},
@@ -170,8 +172,8 @@ class SnapBuilding {
 		{0,0,0,"Pivot"},
 		{0,-2.33,0.130,"Back"},
 		{0,2.33,0.130,"Front"},
-		{-2.45,0,0.130,"Left"},
-		{2.45,0,0.130,"Right"}
+		{-2.495,0,0.130,"Left"},
+		{2.495,0,0.130,"Right"}
 		};
 		radius = 10;
 	};
@@ -242,24 +244,40 @@ class SnapBuilding {
 	class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors
 		points[] = {
 		{0,0,0,"Pivot"},
-		{-2.752, 0, 1.5,"Left"},
-		{2.752, 0, 1.5,"Right"},
+		{-2.64, 0, 1.685,"Left"},
+		{2.64, 0, 1.685,"Right"},
 		{0, 0, 3.37042,"Top"}
 		};
 		radius = 10;
 	};
-	class CinderWall_Preview_DZ: Cinder_DZE {};
+	class CinderWall_Preview_DZ: Cinder_DZE {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.64, 0, -0.009,"Left"},
+		{2.64, 0, -0.009,"Right"},
+		{0, 0, 1.685,"Top"},
+		{0,0,-1.685,"Bottom"}
+		};
+	};
 	class CinderWallDoorway_Preview_DZ: Cinder_DZE {};
 	class CinderWallSmallDoorway_Preview_DZ: Cinder_DZE {}; 
 	class CinderWallHalf_Preview_DZ: Cinder_DZE {
 		points[] = {
 		{0,0,0,"Pivot"},
-		{-2.752, 0, 1.5,"Left"},
-		{2.752, 0, 1.5,"Right"},
+		{-2.64, 0, 1.685,"Left"},
+		{2.64, 0, 1.685,"Right"},
 		{0, 0, 1.5,"Top"}
 		};
 	};
-	class CinderWall_DZ: Cinder_DZE {};
+	class CinderWall_DZ: Cinder_DZE {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.64, 0, 1.685,"Left"},
+		{2.64, 0, 1.685,"Right"},
+		{0, 0, 3.37042,"Top"},
+		{0,0,-1.685,"Bottom"}
+		};
+	};
 	class CinderWallDoorway_DZ: Cinder_DZE {};
 	class CinderWallDoorLocked_DZ: Cinder_DZE {};
 	class CinderWallDoor_DZ: Cinder_DZE {};
@@ -268,35 +286,34 @@ class SnapBuilding {
 	class CinderWallHalf_DZ: Cinder_DZE {
 		points[] = {
 		{0,0,0,"Pivot"},
-		{-2.752, 0, 1.5,"Left"},
-		{2.752, 0, 1.5,"Right"},
-		{0, 0, 1.5,"Top"}
+		{-2.64, 0, 1.685,"Left"},
+		{2.64, 0, 1.685,"Right"},
+		{0, 0, 1.685,"Top"}
 		};
 	};
 	class CinderWallDoorSmall_DZ: Cinder_DZE {};
 	
-	class MetalFloor_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost
+	class MetalFloor_Preview_DZ: FloorsWallsStairs {
 		points[] = {
 		{0,0,0.011,"Pivot"},
-		{0, -2.64, 0.009,"Back"},
-		{0, 2.64, 0.009,"Front"},
-		{-2.64, 0, 0.009,"Left"},
-		{2.64, 0, 0.009,"Right"}
+		{0, -2.64, 0.025,"Back"},
+		{0, 2.64, 0.025,"Front"},
+		{-2.64, 0, 0.025,"Left"},
+		{2.64, 0, 0.025,"Right"}
 		};
 		radius = 12;
 	};
 	class MetalFloor_DZ: FloorsWallsStairs{
 		points[] = {
 		{0,0,0,"Pivot"},
-		{0, -2.64, 0.15,"Back"},
-		{0, 2.64, 0.15,"Front"},
-		{-2.64, 0, 0.15,"Left"},
-		{2.64, 0, 0.15,"Right"}
+		{0, -2.64, 0.166,"Back"},
+		{0, 2.64, 0.166,"Front"},
+		{-2.64, 0, 0.166,"Left"},
+		{2.64, 0, 0.166,"Right"}
 		};
 		radius = 12;
 	};
 	
-	
 	//Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap
 	class WoodCrate_DZ {
 		snapTo[] = {
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Boat.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Boat.hpp
@@ -2,7 +2,11 @@ class Land_Nav_Boathouse : Default
 {
 	lootChance = 0.2;
 	zedPos[] = {{-2.92236,9.2002,3.6665},{7.09473,7.79883,3.6665},{7.18164,-2.03223,3.66864},{1.68994,7.5166,3.67276},{5.49609,0.106445,3.67358},{-5.63037,-1.27246,3.67407},{5.27588,5.51953,3.69006},{-5.03564,6.19141,3.6907},{-6.98779,5.52539,3.69113}};
-	lootPos[] = {{5.28,5.52,3.73},{5.5,0.11,3.71},{1.69,7.52,3.71},{-5.04,6.19,3.71},{-5.63,-1.27,3.69},{-6.99,5.53,3.71},{-2.92,9.2,3.67},{7.09,7.8,3.69},{7.18,-2.03,3.69},{2.8,7.37,6.33},{-2.81,7.41,6.32}};
+	lootPos[] = {
+		//{5.28,5.52,3.73},{5.5,0.11,3.71},{1.69,7.52,3.71},{-5.04,6.19,3.71},{-5.63,-1.27,3.69},{-6.99,5.53,3.71},{-2.92,9.2,3.67},{7.09,7.8,3.69},{7.18,-2.03,3.69},{2.8,7.37,6.33},{-2.81,7.41,6.32},
+		{-5.24414,-2.32715,3.67999},{-5.43994,7.17676,3.67548},{6.13232,0.615234,3.6694},{-1.00439,6.89355,3.68311}
+	};
+	lootPosSmall[] = {{5.2002,7.64746,6.30902},{-1.88623,7.55762,6.30902},{4.75781,-2.49121,3.67984},{-0.398438,4.61914,3.61755},{2.91797,8.50293,3.67038}};
 	lootGroup = Boat;
 };

--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Castle.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Castle.hpp
@@ -7,18 +7,21 @@ class Castle : Default

 class Land_A_Castle_Bergfrit: Castle {
 	zedPos[] = {{1.19141,-1.43848,-2.81638},{0.0595703,2.04785,-2.79636},{-2.19482,4.12305,-0.63858},{2.36133,3.86816,1.83972},{2.64746,-3.5459,3.85541},{-2.09473,-3.44922,6.29901},{-0.540039,-2.35254,8.76691},{-1.15918,3.13867,8.76691},{1.74707,1.26855,8.76691},{-1.62207,-4.28027,13.4801},{1.67578,-0.825195,16.8505},{-2.23047,4.82422,16.856}};
-	lootPos[] = {{0.0595703,2.04785,-2.79636},{1.19141,-1.43848,-2.81638},{-2.19482,4.12305,-0.63858},{2.36133,3.86816,1.83972},{2.64746,-3.5459,3.85541},{-2.09473,-3.44922,6.29901},{-1.15918,3.13867,8.76691},{1.74707,1.26855,8.76691},{-0.540039,-2.35254,8.76691},{-1.62207,-4.28027,13.4801},{-2.23047,4.82422,16.856},{1.67578,-0.825195,16.8505}};
+	//lootPos[] = {{0.0595703,2.04785,-2.79636},{1.19141,-1.43848,-2.81638},{-2.19482,4.12305,-0.63858},{2.36133,3.86816,1.83972},{2.64746,-3.5459,3.85541},{-2.09473,-3.44922,6.29901},{-1.15918,3.13867,8.76691},{1.74707,1.26855,8.76691},{-0.540039,-2.35254,8.76691},{-1.62207,-4.28027,13.4801},{-2.23047,4.82422,16.856},{1.67578,-0.825195,16.8505}};
+	lootPos[] = {{0.0185547,1.91602,-2.8364},{1.19141,-1.43848,-2.8364},{-2.36816,3.32275,-0.628571},{2.36133,3.86768,1.83972},{2.48438,-3.20557,3.85541},{-2.09473,-3.44873,6.31903},{-1.15918,3.13867,8.76691},{1.74707,1.26807,8.76691},{-0.540039,-2.35254,8.76691},{-1.62207,-4.27979,13.4801},{-2.23047,4.82471,16.856},{1.67578,-0.825195,16.8505}};
 };

 class Land_A_Castle_Stairs_A: Castle {
 	zedPos[] = {{0.693604,-1.79297,0.703918},{8.42188,0.878906,0.889343},{8.11035,1.47949,7.01178}};
-	lootPos[] = {{0.693604,-1.79297,0.703918},{8.42188,0.878906,0.889343},{8.11035,1.47949,7.01178}};
+	//lootPos[] = {{0.693604,-1.79297,0.703918},{8.42188,0.878906,0.889343},{8.11035,1.47949,7.01178}};
+	lootPos[] = {{0.697998,-1.79395,0.726929},{8.3938,0.890625,0.875122},{8.17261,1.48926,7.02588}};
 };

 class Land_A_Castle_Gate: Castle {
 	zedPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
 	lootChance = 0.7;
-	lootPos[] = {{0.24,-4.49,-3.14},{-1.25,2.99,-3.07},{4.51,-3.31,-2.95},{4.71,2.71,-2.95},{7.76,0.51,-2.91}};
+	//lootPos[] = {{0.24,-4.49,-3.14},{-1.25,2.99,-3.07},{4.51,-3.31,-2.95},{4.71,2.71,-2.95},{7.76,0.51,-2.91}};
+	lootPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
 };

 class Land_A_Castle_Wall2_End_2: Castle {
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Church.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Church.hpp
@@ -17,10 +17,16 @@ class Land_Church_01 : Church
 	};
 	lootPos[] =
 	{
+		/*
 		{-6.92,-0.38,-4.21},
-		{-6.87,-0.44,-6.47}
+		{-6.87,-0.44,-6.47},
+		*/
+		{-6.92822,0.516602,-4.2191}
+	};
+	lootPosSmall[] =
+	{
+		{-7.27332,-1.16895,-4.22726}
 	};
-	lootPosSmall[] = {{-7.27332,-1.16895,-4.22726}};
 };

 class Land_Church_03 : Church
@@ -42,6 +48,7 @@ class Land_Church_03 : Church
 	};
 	lootPos[] =
 	{
+		/*
 		{5.15332,-6.96875,-14.3021},
 		{-1.7915,-7.67969,-14.302},
 		{-0.0263672,-2.98438,-14.3021},
@@ -53,9 +60,25 @@ class Land_Church_03 : Church
 		{-7.64111,4.81348,-14.3019},
 		{-6.56641,-4.58887,-14.3021},
 		{9.55225,2.22461,-13.7487},
-		{9.93262,-3.85156,-13.7587}
+		{9.93262,-3.85156,-13.7587},
+		*/
+		{-0.665527,-3.02832,-14.3021},
+		{2.90771,3.07422,-14.3021},
+		{9.75342,0.0117188,-13.7588},
+		{4.74609,8.1582,-14.3021},
+		{-2.41943,1.72168,-14.3049}	
+	};
+	lootPosSmall[] =
+	{
+		{-0.791992,2.21191,-13.7321},
+		{2.93945,-1.59766,-13.7349},
+		{6.21191,3.48535,-13.7321},
+		{6.56787,-3.55176,-14.3021},
+		{-0.741211,-8.75684,-14.3021},
+		{-0.126465,5.94434,-14.3021},
+		{-1.14893,-3.6416,-14.3021},
+		{-2.71484,-1.56055,-13.7349}
 	};
-	lootPosSmall[] = {{-0.791992,2.21191,-13.7321},{2.93945,-1.59766,-13.7349},{6.21191,3.48535,-13.7321},{6.56787,-3.55176,-14.3021},{-0.741211,-8.75684,-14.3021},{-0.126465,5.94434,-14.3021},{-1.14893,-3.6416,-14.3021},{-2.71484,-1.56055,-13.7349}};
 	hangPos[] = {{1.72168,-8.39771,-0.172569},{2.08838,-14.4236,-0.27536},{-13.7158,-10.4808,-0.795174},{-12.9072,-16.4105,-0.895065}};
 };

--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Farm.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Farm.hpp
@@ -9,27 +9,39 @@ class Farm : Default

 class Land_stodola_old_open: Farm {
 	zedPos[] = {{-2.58887,-5.9209,-5.08057},{-3.06787,8.63086,-5.08057},{2.52539,10.5234,-5.08044},{4.11035,-10.9307,-5.07043},{-2.62793,-6.55762,-0.99585},{-2.79443,10.2344,-0.993469},{4.62646,10.498,-0.993408},{4.76807,5.00781,-0.993408},{0.749023,-10.5703,2.96448},{1.09131,10.6787,2.96448}};
-	lootPos[] = {{-3.06787,8.63086,-5.08057},{2.52539,10.5234,-5.08044},{4.76807,5.00781,-0.993408},{-2.79443,10.2344,-0.993469},{4.62646,10.498,-0.993408},{1.09131,10.6787,2.96448},{-2.58887,-5.9209,-5.08057},{4.11035,-10.9307,-5.07043},{-2.62793,-6.55762,-0.99585},{0.749023,-10.5703,2.96448}};
+	lootPos[] = {
+		//{-3.07,8.63,-5.08},{2.53,10.52,-5.08},{4.77,5.01,-0.99},{-2.79,10.23,-0.99},{4.63,10.5,-0.99},{1.09,10.68,2.96},{-2.59,-5.92,-5.08},{4.11,-10.93,-5.07},{-2.63,-6.56,-1},{0.75,-10.57,2.96},{2.16,-3.54,-5.08},{-2.74,-10.6,-5.08},{2.88,3.69,-5.08},{3.77,-5.79,-0.03},{4.4,-10.93,-1},
+		{2.5437,-10.6599,2.96444},{-0.4021,-10.6228,2.96444},{-2.56641,-10.8538,-0.995487},{4.6665,3.45386,-5.08055},{-2.24414,10.396,-5.08055},{3.08691,9.24976,-5.08055},{-1.12744,10.5359,-0.993513},{-1.27563,10.6184,2.96444},{2.99268,10.7668,2.96444},{4.35425,-10.5923,-5.08055},{-2.47363,-5.49194,-5.08055}
+	};
 	lootPosSmall[] = {{2.7832,-9.15698,-4.13055},{-1.83765,7.05908,-4.13055},{3.73218,-5.77075,-0.0403633},{0.913818,-11.1099,2.96444},{5.14795,-10.01,-0.997503},{-2.89819,7.21069,-5.08055},{1.79053,8.75171,-5.08055},{5.07788,9.51514,-0.993513},{3.65845,10.1985,2.96444},{0.85498,-3.37793,-4.13055}};
 	hangPos[] = {{-1.50537,5.34473,-5.08813},{0.494141,9.42725,-5.09016},{2.59473,-6.21191,-5.08055},{-1.74854,-2.39844,-1.14301}};
 };

 class Land_Farm_Cowshed_a: Farm {
 	zedPos[] = {{7.87988,2.94141,-3.08789},{9.74023,-2.48633,-3.08771},{-1.06836,-5.92188,-3.08765},{-1.32764,5.61426,-3.08765},{2.88428,-2.34473,-3.08765},{4.81982,5.72852,-3.08765},{8.83936,-5.60254,-3.06757}};
-	lootPos[] = {{-1.06836,-5.92188,-3.08765},{8.83936,-5.60254,-3.06757},{9.74023,-2.48633,-3.08771},{2.88428,-2.34473,-3.08765},{7.87988,2.94141,-3.08789},{4.81982,5.72852,-3.08765},{-1.32764,5.61426,-3.08765}};
+	lootPos[] = {
+		//{-1.06836,-5.92188,-3.08765},{8.83936,-5.60254,-3.06757},{9.74023,-2.48633,-3.08771},{2.88428,-2.34473,-3.08765},{7.87988,2.94141,-3.08789},{4.81982,5.72852,-3.08765},{-1.32764,5.61426,-3.08765},
+		{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}	
+	};
 	lootPosSmall[] = {{-6.74829,-2.98145,-3.03766},{1.34399,3.79199,-3.03766}};
 };

 class Land_stodola_open: Farm {
 	zedPos[] = {{-2.58228,-0.526367,-4.17346},{-0.0480957,-4.88965,-4.13593},{-2.60376,5.31641,-4.12805},{0.98291,6.20508,-4.11121}};
-	lootPos[] = {{-2.60376,5.31641,-4.12805},{-2.58228,-0.526367,-4.17346},{-0.0480957,-4.88965,-4.13593},{0.98291,6.20508,-4.11121}};
+	lootPos[] = {
+		//{-2.60376,5.31641,-4.12805},{-2.58228,-0.526367,-4.17346},{-0.0480957,-4.88965,-4.13593},{0.98291,6.20508,-4.11121},
+		{-3.77881,6.2478,-4.11348},{1.59106,6.31494,-4.10928},{-3.94727,-1.95605,-4.15359},{-0.440918,-3.91187,-4.1938}
+	};
 	lootPosSmall[] = {{-4.22217,-6.12866,-3.32453}};
 	hangPos[] = {{-0.932617,-3.35962,-4.16446},{-2.01563,-0.115112,-4.19492}};
 };

 class Land_Barn_W_01: Farm {
 	zedPos[] = {{5.78711,18.9463,-2.62683},{-4.4646,16.665,-2.61633},{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-2.99072,-4.16992,-2.58276},{3.95435,4.88379,-2.57434}};
-	lootPos[] = {{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-4.4646,16.665,-2.61633},{5.78711,18.9463,-2.62683},{3.95435,4.88379,-2.57434},{-2.99072,-4.16992,-2.58276}};
+	lootPos[] = {
+		//{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-4.4646,16.665,-2.61633},{5.78711,18.9463,-2.62683},{3.95435,4.88379,-2.57434},{-2.99072,-4.16992,-2.58276},
+		{-4.45776,14.2153,-2.71607},{4.34277,-6.15088,-2.57279}
+	};
 	lootPosSmall[] = {{4.09351,10.3872,-2.69559},{0.10791,3.48096,-2.64446},{-4.51636,-12.2603,-2.67148},{3.54419,-15.8311,-2.63077}};
 };

@@ -39,18 +51,25 @@ class land_shed_m01: Farm { //DZE ADDED

 class Land_Barn_W_02: Farm {
 	zedPos[] = {{3.35938,-0.151367,-2.31305},{-2.84351,0.213867,-2.31177},{-2.94604,-5.01465,-2.28998},{2.53711,-5.89258,-2.28949},{3.16479,5.56543,-2.28406},{-5.63306,4.83105,-2.26355}};
-	lootPos[] = {{3.17,5.57,-2.28},{2.54,-5.89,-2.29},{-2.84,0.21,-2.31},{-5.63,4.83,-2.26},{-0.21,3.44,-2.31},{-0.74,-5.93,-2.31}};
+	//lootPos[] = {{3.17,5.57,-2.28},{2.54,-5.89,-2.29},{-2.84,0.21,-2.31},{-5.63,4.83,-2.26},{-0.21,3.44,-2.31},{-0.74,-5.93,-2.31}};
+	lootPos[] = {{3.16504,5.56543,-2.31409},{3.35938,-0.152344,-2.31305},{2.53613,-5.89453,-2.30957},{-2.94629,-5.01367,-2.31006},{-2.84375,0.212891,-2.31183},{-5.63281,4.8291,-2.31363}};
 };

 class Land_Farm_Cowshed_c: Farm {
 	zedPos[] = {{-2.41504,2.98633,-3.12582}};	
-	lootPos[] = {{-2.41504,2.98633,-3.12582}};	
+	lootPos[] = {
+		//{-2.41504,2.98633,-3.12582},
+		{0.625,-2.61133,-3.06583}
+	};
 	lootPosSmall[] = {{-2.82446,3.18457,-3.11581}};
 };

 class Land_Farm_Cowshed_b: Farm {
 	zedPos[] = {{0.0620117,0.0517578,-3.11111},{-4.77441,-2.4834,-3.05106},{4.68506,2.18945,-3.04105}};
-	lootPos[] = {{4.68506,2.18945,-3.04105},{0.0620117,0.0517578,-3.11111},{-4.77441,-2.4834,-3.05106}};
+	lootPos[] = {
+		//{4.68506,2.18945,-3.04105},{0.0620117,0.0517578,-3.11111},{-4.77441,-2.4834,-3.05106},
+		{-3.26782,2.71875,-3.0311},{5.41699,-2.57813,-3.04111}
+	};
 	lootPosSmall[] = {{3.46802,3.36621,-3.05112},{-9.98511,-3.2793,-3.09109}};
 };

@@ -61,18 +80,26 @@ class Land_Shed_W02: Farm {
 };

 //DZE ADDED BELOW
-class land_jzd_kr2: Farm {
+class land_jzd_kr2: Farm { // one story cement barn
+	zedPos[] = {{2.12061,-22.3691,-6.30976},{2.86523,-3.03125,-6.17321},{0.813965,4.67188,-6.17321}};
+	//lootPos[] = {{3.86279,9.33008,-2.05339},{-2.43359,-9.56152,-2.0534},{2.12061,-22.3691,-6.30976},{2.13379,17.9229,-6.30976},{2.86523,-3.03125,-6.17321},{0.813965,4.67188,-6.17321}};
 	lootPos[] = {{1.92139,-4.90527,-6.17321},{0.709961,5.00488,-6.17321},{1.8623,7.37109,1.40623},{3.00684,-3.30566,1.41873},{-3.0625,-3.38477,-2.05339},{-2.62646,10.8418,-2.05339}};
 };
-class land_jzd_kr1: Farm {
+class land_jzd_kr1: Farm { // one story cement barn
+	zedPos[] = {{0.0078125,-1.14941,-2.14676},{-4.2085,-12.3887,-2.14676},{0.878906,-9.51953,-6.26657}};
+	//lootPos[] = {{-2.42578,6.77832,-2.14676},{0.0078125,-1.14941,-2.14676},{-4.2085,-12.3887,-2.14676},{0.878906,-9.51953,-6.26657},{-0.756348,0.71875,-6.26657}};
 	lootPos[] = {{-1.04834,-3.67578,-6.27279},{1.63818,0.775391,-6.27279},{-1.41992,5.10449,-6.27279},{-0.993164,2.94629,-2.15298},{0.717285,-3.79688,-2.15298}};
 };
-class land_jzd_stodola2: Farm {
+class land_jzd_stodola2: Farm { // one story cement, sliding wooe doors, hay bales inside
+	zedPos[] = {{5.2832,-11.1592,-2.0262},{-2.20215,-0.935547,-2.0262}};
+	//lootPos[] = {{5.2832,-11.1592,-2.0262},{4.56445,10.0796,-2.0262},{-2.20215,-0.935547,-2.0262},{4.02734,4.24463,-2.0262}};
 	lootPos[] = {{8.15527,11.8477,-2.0262},{5.5127,5.6377,-2.0262},{-4.16113,3.67383,-2.0262},{7.53223,-14.4741,-2.0262},{1.16992,0.390625,1.31123}};
 };
 class land_jzd_stodola1: Farm {
 	lootPos[] = {{-3.81592,-11.418,-2.0262},{1.73877,-6.20605,-2.0262},{-4.13477,-0.265625,-2.0262},{-1.04883,0.180664,-2.0262}};
 };
-class Land_sara_stodola: Farm {
+class Land_sara_stodola: Farm { // brown wooden barn one story
+	zedPos[] = {{-0.637695,2.9707,-2.19523},{0.459961,0.398438,-2.19523}};
+	//lootPos[] = {{2.72266,-1.14648,-2.19523},{4.06152,3.59375,-2.19523},{-3.32324,3.92969,-2.19523},{-3.99219,-0.698242,-2.19523}};
 	lootPos[] = {{5.01367,3.33118,-2.19523},{2.51758,1.05737,-2.19523},{-1.30957,-1.02954,-2.19523},{-4.24414,4.0238,-2.19523},{5.16211,-0.661621,-2.19523}};
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Hospital.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Hospital.hpp
@@ -10,16 +10,20 @@ class Hospital : Default

 class Land_A_Hospital : Hospital
 {
-	lootPos[] = {{0.79834,-1.16895,-7.33966},{-7.2334,-2.63574,-7.33966},{-16.3687,-2.4043,-7.33966},{-12.2847,-3.19434,-7.33966},{4.24268,-3.59375,-7.33966},{-3.2666,-0.925781,-7.33966},{6.85693,-2.75098,-7.33966},{11.0151,-3.9541,-7.33966},{16.8198,-4.71094,-7.33966},{-1.6875,5.47168,-7.4494},{12.7476,0.144531,3.29184},{10.2661,-1.21582,3.29184}};
-	zedPos[] = {{-1.6875,5.47168,-7.4494},{0.79834,-1.16895,-7.33966},{11.0151,-3.9541,-7.33966},{-12.2847,-3.19434,-7.33966},{-16.3687,-2.4043,-7.33966},{16.8198,-4.71094,-7.33966},{-3.2666,-0.925781,-7.33966},{4.24268,-3.59375,-7.33966},{6.85693,-2.75098,-7.33966},{-7.2334,-2.63574,-7.33966},{10.2661,-1.21582,3.29184},{12.7476,0.144531,3.29184}};
+	lootPos[] = {
+		//{0.79834,-1.16895,-7.33966},{-7.2334,-2.63574,-7.33966},{-16.3687,-2.4043,-7.33966},{-12.2847,-3.19434,-7.33966},{4.24268,-3.59375,-7.33966},{-3.2666,-0.925781,-7.33966},{6.85693,-2.75098,-7.33966},{11.0151,-3.9541,-7.33966},{16.8198,-4.71094,-7.33966},{-1.6875,5.47168,-7.4494},{12.7476,0.144531,3.29184},{10.2661,-1.21582,3.29184},
+		{17.665,-4.67188,-7.2566},{-20.7139,-1.48047,-7.2566},{-15.6924,8.60889,-7.2566},{-15.6064,1.95557,-6.8266},{-16.2139,2.27051,-7.2566},{-8.68652,4.19189,-3.7576},{14.2441,-3.98535,-3.7576},{21.5693,5.16455,1.19051},{18.3779,2.40869,6.2524},{-15.3359,-1.25439,3.40458},{-20.3252,0.410156,-3.82761}
+	};
 	lootPosSmall[] = {{9.97754,-0.814453,-7.2566},{-19.6143,1.83887,-7.1666},{-19.6055,1.6084,-6.7866},{-19.583,4.91748,-6.7866},{-19.5576,4.7417,-6.0266},{-22.1982,9.59033,-7.2566},{-12.3379,9.53857,-6.8266},{-3.23438,6.01758,-6.8266},{-13.626,3.04248,-6.0466},{2.86426,-1.68604,-6.6466},{-5.58594,1.38232,-3.7576},{-4.05762,-2.48584,-3.7576},{-11.8428,5.15576,-2.5976},{-5.57129,-3.17236,-2.5976},{-5.65332,5.01416,-2.5976},{-12.5439,-2.33838,-3.6876},{-12.5801,-1.32617,-3.3076},{-12.5928,-1.56299,-2.9276},{-12.6162,-2.24805,-2.1676},{-12.5654,2.4126,-2.5476},{14.8721,3.96875,3.66054},{16.9033,-1.33838,4.01669},{21.3174,4.88916,6.2524},{-4.00488,7.89893,-3.82761}};
+	zedPos[] = {{-1.6875,5.47168,-7.4494},{0.79834,-1.16895,-7.33966},{11.0151,-3.9541,-7.33966},{-12.2847,-3.19434,-7.33966},{-16.3687,-2.4043,-7.33966},{16.8198,-4.71094,-7.33966},{-3.2666,-0.925781,-7.33966},{4.24268,-3.59375,-7.33966},{6.85693,-2.75098,-7.33966},{-7.2334,-2.63574,-7.33966},{10.2661,-1.21582,3.29184},{12.7476,0.144531,3.29184}};
 };

 class MASH : Hospital
 {
 	maxRoaming = 1;
 	zombieClass[] = {"z_soldier","z_soldier_heavy","z_doctor","z_doctor","z_doctor"};
-	lootPos[] = {{1.18213,-1.64844,-1.11786},{0.24707,0.798828,-1.11798}};
+	//lootPos[] = {{1.18213,-1.64844,-1.11786},{0.24707,0.798828,-1.11798}};
+	lootPos[] = {{1.18213,-1.65039,-1.17793},{0.24707,0.799316,-1.17803}};
 	zedPos[] = {{0.24707,0.798828,-1.11798},{1.18213,-1.64844,-1.11786}};
 };

@@ -31,7 +35,8 @@ class USMC_WarfareBFieldhHospital : MASH
 {
 	minRoaming = 1;
 	maxRoaming = 3;
-	lootPos[] = {{-3.52246,-5.03906,1.20731},{2.36621,-4.52246,1.20792},{1.39209,-0.420898,1.20752},{1.14258,5.01172,1.20786},{3.7124,1.89746,1.19794}};
+	//lootPos[] = {{-3.52246,-5.03906,1.20731},{2.36621,-4.52246,1.20792},{1.39209,-0.420898,1.20752},{1.14258,5.01172,1.20786},{3.7124,1.89746,1.19794}};
+	lootPos[] = {{-3.52246,-5.03931,1.14726},{2.36621,-4.52295,1.14786},{1.39063,-0.423096,1.14746},{1.14258,5.00952,1.1478},{3.7124,1.89795,1.14788}};
 	zedPos[] = {{3.7124,1.89746,1.19794},{-3.52246,-5.03906,1.20731},{1.39209,-0.420898,1.20752},{1.14258,5.01172,1.20786},{2.36621,-4.52246,1.20792}};
 };

--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Hunting.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Hunting.hpp
@@ -14,5 +14,6 @@ class Land_Misc_deerstand: Hunting
 	maxRoaming = 3;
 	zedPos[] = {{0.419922,-0.234375,0.985291},{-0.836914,-0.929688,0.985291}};
 	lootChance = 0.5;
-	lootPos[] = {{-0.836914,-0.929688,0.985291},{0.419922,-0.234375,0.985291}};
+	//lootPos[] = {{-0.836914,-0.929688,0.985291},{0.419922,-0.234375,0.985291}};
+	lootPos[] = {{-0.923828,-0.808594,1.08539},{0.419922,-0.237305,1.08539}};
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Industrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Industrial.hpp
@@ -25,11 +25,21 @@ class Land_Ind_Workshop01_01 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{0.59668,-2.43066,-1.29449},
 		{1.24536,0.464844,-1.29498},
-		{-0.661621,-0.498047,-1.29883}
+		{-0.661621,-0.498047,-1.29883},
+		*/
+		{1.31201,-2.71387,-1.29234},
+		{-0.819336,0.449219,-1.29946}
+	};
+	lootPosSmall[] =
+	{
+		{1.81372,-3.33643,-0.714019},
+		{1.92627,-1.69531,-1.29493},
+		{-1.19482,2.00977,-0.22825},
+		{-0.82251,1.2583,-0.836819}
 	};
-	lootPosSmall[] = {{1.81372,-3.33643,-0.714019},{1.92627,-1.69531,-1.29493},{-1.19482,2.00977,-0.22825},{-0.82251,1.2583,-0.836819}};
 };

 class Land_Ind_Garage01 : Industrial
@@ -43,12 +53,23 @@ class Land_Ind_Garage01 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-0.580322,-1.49609,-1.23523},
 		{-0.834229,2.75684,-1.22571},
 		{2.47778,-1.12793,-1.23743},
-		{1.32104,1.63184,-1.23218}
+		{1.32104,1.63184,-1.23218},
+		*/
+		{1.73755,2.71973,-1.24332},
+		{-0.880371,-1.9082,-1.23318},
+		{0.607178,3.2373,-1.23157}
+	};
+	lootPosSmall[] =
+	{
+		{2.9375,2.47754,-1.12036},
+		{2.8606,3.33398,-1.12131},
+		{1.35205,3.58398,-0.0119934},
+		{1.76196,3.62207,-0.772003}
 	};
-	lootPosSmall[] = {{2.9375,2.47754,-1.12036},{2.8606,3.33398,-1.12131},{1.35205,3.58398,-0.0119934},{1.76196,3.62207,-0.772003}};
 };

 class Land_Ind_Workshop01_02 : Industrial
@@ -61,11 +82,19 @@ class Land_Ind_Workshop01_02 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{1.15479,-0.554688,-1.42944},
 		{-1.18579,-0.178711,-1.42859},
-		{-0.661377,1.10352,-1.42688}
+		{-0.661377,1.10352,-1.42688},
+		*/
+		{1.47144,-0.825195,-1.42987},
+		{-1.29663,-0.373047,-1.42896}
+	};
+	lootPosSmall[] =
+	{
+		{1.65283,1.66846,-1.42742},
+		{-1.75757,-1.08887,-1.43804}
 	};
-	lootPosSmall[] = {{1.65283,1.66846,-1.42742},{-1.75757,-1.08887,-1.43804}};
 };

 class Land_Ind_Workshop01_04 : Industrial
@@ -82,16 +111,29 @@ class Land_Ind_Workshop01_04 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-1.37415,4.18896,-1.53123},
 		{0.695435,4.24561,-1.52934},
 		{-1.06677,2.69531,-1.53062},
 		{0.79248,-4.60742,-1.49341},
 		{-1.84424,-6.1709,-1.44427},
 		{-1.05566,-4.08398,-1.51927},
-		{1.43774,-6.59424,-1.41742}
+		{1.43774,-6.59424,-1.41742},
+		*/
+		{-1.62207,-6.37305,-1.52724},
+		{-0.118408,-3.88281,-1.52788},
+		{-1.01611,2.13428,-1.53099}
+	};
+	lootPosSmall[] =
+	{
+		{-1.3833,-3.02734,-0.298156},
+		{-1.9519,-3.37891,-1.52803},
+		{1.60425,4.75244,-1.52979},
+		{-0.324219,1.91504,-0.680825},
+		{-0.302734,2.08545,0.0790772},
+		{-1.61523,-3.03809,0.0718207}
 	};
 	hangPos[] = {{-0.541748,4.01221,-2.03068}};
-	lootPosSmall[] = {{-1.3833,-3.02734,-0.298156},{-1.9519,-3.37891,-1.52803},{1.60425,4.75244,-1.52979},{-0.324219,1.91504,-0.680825},{-0.302734,2.08545,0.0790772},{-1.61523,-3.03809,0.0718207}};
 };

 class Land_Ind_Workshop01_L : Industrial
@@ -108,15 +150,27 @@ class Land_Ind_Workshop01_L : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-3.21143,4.7793,-1.30246},
 		{-0.813477,3.56348,-1.30765},
 		{-2.38379,2.36133,-1.30405},
 		{3.81299,-4.27051,-1.31345},
 		{0.903809,-2.58984,-1.31418},
 		{2.54688,-2.17773,-1.31482},
-		{1.72021,-3.75586,-1.31332}
+		{1.72021,-3.75586,-1.31332},
+		*/
+		{3.89063,-4.09888,-1.31299},
+		{1.80273,-1.88599,-1.31412},
+		{-0.928223,4.50635,-1.31364}
+	};
+	lootPosSmall[] =
+	{
+		{0.62793,-1.49097,-1.23395},
+		{0.805664,-1.45605,-0.0939465},
+		{4.56055,-5.29443,-1.31279},
+		{0.0273438,5.04443,-0.47565},
+		{0.25,5.00342,0.284006}
 	};
-	lootPosSmall[] = {{0.62793,-1.49097,-1.23395},{0.805664,-1.45605,-0.0939465},{4.56055,-5.29443,-1.31279},{0.0273438,5.04443,-0.47565},{0.25,5.00342,0.284006}};
 };

 class Land_Hangar_2 : Industrial
@@ -133,15 +187,31 @@ class Land_Hangar_2 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{10.1245,-6.48926,-2.56311},
 		{11.9399,7.90918,-2.56323},
 		{1.79614,7.12695,-2.56329},
 		{-11.8945,10.541,-2.56311},
 		{-8.96973,-4.34961,-2.56323},
 		{-0.560791,-7.5957,-2.56317},
-		{5.98828,-2.6123,-2.56323}
+		{5.98828,-2.6123,-2.56323},
+		*/
+		{-13.1816,10.4204,-2.56318},
+		{-0.127441,-2.88794,-2.56318},
+		{0.291992,3.94775,-2.56318},
+		{8.94482,6.87793,-2.56318},
+		{-13.688,-4.67871,-2.56318},
+		{3.4248,-8.1499,-2.56318}
+	};
+	lootPosSmall[] =
+	{
+		{-14.3721,11.1743,-2.56319},
+		{-0.0571289,5.94385,-2.56319},
+		{11.751,11.3525,-2.56319},
+		{-0.458008,-9.68652,-2.56319},
+		{-14.3472,-6.29736,-2.56319},
+		{14.4277,-4.83154,-2.56319}
 	};
-	lootPosSmall[] = {{-14.3721,11.1743,-2.56319},{-0.0571289,5.94385,-2.56319},{11.751,11.3525,-2.56319},{-0.458008,-9.68652,-2.56319},{-14.3472,-6.29736,-2.56319},{14.4277,-4.83154,-2.56319}};
 };

 class Land_A_FuelStation_Build : Industrial
@@ -157,12 +227,19 @@ class Land_A_FuelStation_Build : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-1.31885,-0.655273,-1.57446},
 		{1.82349,0.769531,-1.57458},
 		{1.67871,-0.918945,-1.57458},
-		{-1.23218,1.26758,-1.57458}
+		{-1.23218,1.26758,-1.57458},
+		*/
+		{1.88281,-0.879639,-1.57458}
+	};
+	lootPosSmall[] =
+	{
+		{-1.92578,0.237061,-0.604466},
+		{-1.38672,0.592651,-1.09459}
 	};
-	lootPosSmall[] = {{-1.92578,0.237061,-0.604466},{-1.38672,0.592651,-1.09459}};
 };

 class Land_Shed_Ind02 : Industrial
@@ -177,13 +254,33 @@ class Land_Shed_Ind02 : Industrial
 	};
 	lootPos[] =
 	{
-		{-2.28149,-5.67188,-4.65601},
-		{4.44653,9.67578,-4.66602},
-		{4.41162,2.65137,-1.27954},
-		{-0.437988,11.6953,-1.2764},
-		{-3.44482,12.2129,-1.27704}
+		/*
+		{-2.28,-5.67,-4.66},
+		{4.45,9.68,-4.67},
+		{4.41,2.65,-1.28},
+		{-0.44,11.7,-1.28},
+		{-3.44,12.21,-1.28},
+		{-2.77,5.85,-4.63},
+		{3.42,1.62,-4.63},
+		{4.69,-9.2,-1.28},
+		{-3.93,-2.17,-1.29},
+		{-3.94,-8.55,-1.29},
+		{-5.57,9.01,-4.13},
+		{-5.53,-8.73,-4.09},
+		*/
+		{3.39893,9.21875,-4.67596},
+		{1.29541,0.227539,-4.67596},
+		{-0.458984,11.6934,-1.28638},
+		{-4.00879,-8.42773,-1.29721}
+	};
+	lootPosSmall[] =
+	{
+		{-3.66064,-0.253906,-4.66599},
+		{4.44873,9.92578,-4.66599},
+		{-0.209961,-0.124023,-4.66599},
+		{4.89307,-0.166992,-1.29736},
+		{-3.74805,12.123,-1.28674}
 	};
-	lootPosSmall[] = {{-3.66064,-0.253906,-4.66599},{4.44873,9.92578,-4.66599},{-0.209961,-0.124023,-4.66599},{4.89307,-0.166992,-1.29736},{-3.74805,12.123,-1.28674}};
 };

 class Land_Misc_PowerStation : Industrial
@@ -195,10 +292,26 @@ class Land_Misc_PowerStation : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{4.09863,4.89746,-1.25742},
-		{4.22803,-1.19922,-1.28812}
+		{4.22803,-1.19922,-1.28812},
+		*/
+		{2.98767,-5.02051,1.54777},
+		{3.67371,5.62207,-2.04407}
+	};
+	lootPosSmall[] =
+	{
+		{4.92017,6.24707,-1.26179},
+		{1.62573,-6.4541,-1.13445},
+		{1.33667,-6.37207,-0.374413},
+		{-3.20825,-6.50195,0.315748},
+		{-3.84949,-6.2627,-1.16402},
+		{-1.35608,-6.3877,-0.374122},
+		{-0.895142,-6.39453,-0.37413},
+		{2.30383,2.21387,-2.04394},
+		{0.0808105,-0.0566406,-1.204},
+		{1.98657,3.49121,-0.623982}
 	};
-	lootPosSmall[] = {{4.92017,6.24707,-1.26179},{1.62573,-6.4541,-1.13445},{1.33667,-6.37207,-0.374413},{-3.20825,-6.50195,0.315748},{-3.84949,-6.2627,-1.16402},{-1.35608,-6.3877,-0.374122},{-0.895142,-6.39453,-0.37413},{2.30383,2.21387,-2.04394},{0.0808105,-0.0566406,-1.204},{1.98657,3.49121,-0.623982}};
 };

 class Land_Shed_W01 : Industrial
@@ -209,7 +322,8 @@ class Land_Shed_W01 : Industrial
 	};
 	lootPos[] =
 	{
-		{-1.52832,-0.249023,-1.41138}
+		//{-1.52832,-0.249023,-1.41138}
+		{-1.46289,-0.12207,-1.41129}
 	};
 };

@@ -243,6 +357,7 @@ class Land_Tovarna2 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-11.63,7.2,-5.56},
 		{-12.07,2.57,-5.63},
 		{-4.9,6.63,-5.56},
@@ -276,9 +391,49 @@ class Land_Tovarna2 : Industrial
 		{-10.16,7.67,6.56},
 		{-2.09,-7.35,6.57},
 		{0.91,1.59,6.56},
-		{-1.2,6.85,6.58}
+		{-1.2,6.85,6.58},
+		*/
+		{-2.02222,7.87256,-5.62933},
+		{-12.2107,-8.15527,-5.62469},
+		{-12.2112,7.7998,-5.62933},
+		{-8.99805,7.72168,-2.31135},
+		{-6.54077,8.80469,-2.31156},
+		{-12.6907,8.04932,1.58661},
+		{-9.06421,8.10645,1.58661},
+		{-5.39453,9.02783,1.56174},
+		{-8.26465,-0.520508,0.37684},
+		{-3.83984,4.99121,-2.31156},
+		{-6.6416,8.03174,-5.62933},
+		{-3.31763,-1.80762,-5.59492},
+		{-6.66382,7.57861,1.56174},
+		{-12.8,4.30664,1.58661},
+		{-12.8074,-0.535156,0.374299},
+		{-12.4324,5.15918,-2.31135},
+		{-12.8635,1.78174,-5.61933},
+		{-3.19507,-8.49707,-5.63091},
+		{6.43872,-3.48145,-4.62884},
+		{9.97998,-2.35059,-4.62604}
+	};
+	lootPosSmall[] =
+	{
+		{-3.22974,9.69678,1.56174},
+		{-10.2683,8.87354,1.58661},
+		{-13.2981,7.09912,-2.31135},
+		{-7.51001,9.64307,-2.31156},
+		{-8.13623,5.60693,-5.62933},
+		{-13.2112,0.257813,-5.62933},
+		{2.41431,-2.05469,-5.62689},
+		{1.64185,8.75879,0.374298},
+		{-13.2427,-8.98438,3.3743},
+		{-4.927,0.368164,0.372077},
+		{-3.88208,-3.81641,6.62795},
+		{-7.47241,4.50391,1.56174},
+		{-8.28833,4.20068,1.58661},
+		{-13.2944,-9.01514,0.374299},
+		{-7.38672,4.53418,-2.31156},
+		{-5.28125,2.875,-5.62933},
+		{2.42627,-8.75684,-5.62154}
 	};
-	lootPosSmall[] = {{-3.22974,9.69678,1.56174},{-10.2683,8.87354,1.58661},{-13.2981,7.09912,-2.31135},{-7.51001,9.64307,-2.31156},{-8.13623,5.60693,-5.62933},{-13.2112,0.257813,-5.62933},{2.41431,-2.05469,-5.62689},{1.64185,8.75879,0.374298},{-13.2427,-8.98438,3.3743},{-4.927,0.368164,0.372077},{-3.88208,-3.81641,6.62795},{-7.47241,4.50391,1.56174},{-8.28833,4.20068,1.58661},{-13.2944,-9.01514,0.374299},{-7.38672,4.53418,-2.31156},{-5.28125,2.875,-5.62933},{2.42627,-8.75684,-5.62154}};
 };

 class Land_Ind_Vysypka : Industrial
@@ -297,6 +452,7 @@ class Land_Ind_Vysypka : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{0.487793,4.9541,-4.9686},
 		{1.08203,-0.407227,-4.96802},
 		{-0.0336914,-10.8203,-4.96686},
@@ -305,9 +461,19 @@ class Land_Ind_Vysypka : Industrial
 		{-6.26709,26.7344,-4.9772},
 		{1.64697,23.4033,-4.97098},
 		{7.146,3.9248,-4.96973},
-		{4.63623,-12.1621,-4.9697}
+		{4.63623,-12.1621,-4.9697},
+		*/
+		{1.50195,-15.9287,-4.9663},
+		{1.88208,6.03809,-4.97856},
+		{-8.42188,10.0103,-4.97909},
+		{1.21948,13.2168,-4.97966},
+		{-7.09595,26.0376,-4.99675}
+	};
+	lootPosSmall[] =
+	{
+		{2.5459,-16.5952,-4.97639},
+		{-8.72485,-22.1318,-4.97806}
 	};
-	lootPosSmall[] = {{2.5459,-16.5952,-4.97639},{-8.72485,-22.1318,-4.97806}};
 };

 class Land_A_BuildingWIP : Industrial
@@ -347,37 +513,96 @@ class Land_A_BuildingWIP : Industrial
 	lootChance = 0.5;
 	lootPos[] =
 	{
-		{-4.62646,4.52344,-6.45264},
-		{-12.6382,0.492188,-6.53247},
-		{-14.5049,-8.13086,-6.49951},
-		{-16.0015,-9.80957,-6.50415},
-		{-15.563,-5.17871,-6.50513},
-		{0.944824,-2.30176,-6.43042},
-		{7.28076,3.20898,-6.4104},
-		{9.75732,10.1123,-6.4082},
-		{14.771,7.2959,-6.47754},
-		{15.4502,-0.316406,-6.52979},
-		{20.4893,2.31836,-4.52576},
-		{17.3125,-3.09961,-2.53271},
-		{10.7061,-6.51563,-2.53259},
-		{2.22461,-9.21582,-2.53406},
-		{-8.92041,-7.18848,-2.53308},
-		{-16.3184,-8.35645,-2.53357},
-		{-21.3066,-6.79297,-2.53174},
-		{-21.6021,-1.79297,-2.53174},
-		{-17.8853,6.63281,-2.53186},
-		{-23.1982,8.44629,-2.53186},
-		{-17.1982,9.58594,-2.53174},
-		{-4.99121,9.80957,-2.53174},
-		{14.0864,7.43945,-2.52686},
-		{10.5786,-6.84863,1.4812},
-		{-3.19141,-2.49414,1.49414},
-		{-13.8184,3.99023,1.47827},
-		{-15.9497,-6.17578,1.48804},
-		{-20.6992,-16.9766,1.48291},
-		{-15.415,-13.3896,5.4668}
+		/*
+		{0.16,11.99,-6.49},
+		{-7.62,-9.06,-6.47},
+		{-4.94,-6.01,-6.46},
+		{-11.87,-9.73,-6.49},
+		{-8.89,9.19,-6.48},
+		{-4.24,10.81,-6.51},
+		{-21.71,4.84,-6.41},
+		{-23.5,11.51,-6.46},
+		{-23.95,-1.07,-6.45},
+		{-21.7,-9.83,-6.52},
+		{-14.56,-13.11,-6.5},
+		{-17.56,-15.55,-6.52},
+		{-14.35,-16.07,-4.52},
+		{-0.67,-14.4,-2.54},
+		{15.23,-15.17,-2.54},
+		{5.96,-12.56,-2.54},
+		{-23.95,3.74,-2.53},
+		{-22.82,8.38,1.48},
+		{-11.27,10.63,1.5},
+		{8.1,7.48,1.49},
+		{17.76,2.55,1.43},
+		{-7.71,-13.39,-6.87},
+		{0.02,-13.18,-6.87},
+		{8.24,-13.4,-6.87},
+		{7.84,-7.36,-6.51},
+		{0.9,4.92,-6.38},
+		{-5.73,-1.68,-6.41},
+		{-15.84,0.39,-6.48},
+		{-11.72,15.21,-6.47},
+		{-15.68,9.71,-6.44},
+		*/
+		{-15.4871,-9.755,-6.53698},
+		{-10.4043,-9.76697,-6.53213},
+		{-12.0098,-5.50208,-6.53936},
+		{-21.5681,-9.69409,-6.54067},
+		{-23.7563,8.18347,-6.45811},
+		{2.82544,11.3822,-6.47826},
+		{-7.49634,-9.24609,-6.52115},
+		{6.21216,7.7356,-6.41615},
+		{-9.29541,0.683716,-6.53778},
+		{16.8376,2.03186,-2.54291},
+		{4.77661,-9.35681,-1.50389},
+		{-20.3762,-2.86389,-2.53182},
+		{-14.3564,-9.68604,-2.5341},
+		{-24.1724,7.65405,-2.53182},
+		{1.15796,8.03552,-2.53182},
+		{-24.0901,11.4227,1.47364},
+		{-22.1218,11.8442,1.47786},
+		{-22.7849,10.4189,1.47402},
+		{-8.66797,5.81238,1.47396},
+		{-11.4856,-2.29419,2.50674},
+		{-15.6948,-13.5236,5.46682},
+		{-8.00171,-1.07678,5.31147},
+		{8.66626,-8.14514,5.344},
+		{11.5269,2.50977,-6.52237},
+		{-15.926,-17.5713,-6.53193},
+		{-23.8391,0.109863,-6.47638},
+		{-24.2957,2.29199,-2.53182},
+		{-7.6853,11.9902,-2.53182},
+		{-17.7314,1.81299,-2.53182},
+		{2.94116,6.97754,1.47579},
+		{-9.39014,-9.62451,1.47428},
+		{-24.1311,9.47656,5.46242}
+	};
+	lootPosSmall[] =
+	{
+		{-10.4377,-8.03418,-6.54007},
+		{-15.9675,-6.70959,-6.54014},
+		{-15.8289,7.37451,-6.46946},
+		{-6.89136,-5.30615,-6.52994},
+		{-7.37231,0.36084,-5.627},
+		{-20.3455,-4.8197,-2.24182},
+		{-13.9419,-5.02502,-2.53268},
+		{-6.2439,11.7518,-1.50182},
+		{-23.1213,12.5128,1.47477},
+		{-24.5806,9.80115,1.47403},
+		{4.63794,-0.358765,2.17724},
+		{-5.92505,11.8485,2.50079},
+		{-11.2415,4.78796,6.37765},
+		{-24.7756,-10.0265,5.46264},
+		{5.75464,-9.76001,1.47425},
+		{-23.0313,2.87158,-5.43137},
+		{-0.398193,7.37256,-6.52535},
+		{13.678,1.89307,-6.54251},
+		{-7.79321,-9.53564,-2.53376},
+		{15.3154,11.478,-2.54182},
+		{-19.8633,12.3149,-2.54182},
+		{-21.0286,-11.563,5.46691}
 	};
-	lootPosSmall[] = {{-10.4377,-8.03418,-6.54007},{-15.9675,-6.70959,-6.54014},{-15.8289,7.37451,-6.46946},{-6.89136,-5.30615,-6.52994},{-7.37231,0.36084,-5.627},{-20.3455,-4.8197,-2.24182},{-13.9419,-5.02502,-2.53268},{-6.2439,11.7518,-1.50182},{-23.1213,12.5128,1.47477},{-24.5806,9.80115,1.47403},{4.63794,-0.358765,2.17724},{-5.92505,11.8485,2.50079},{-11.2415,4.78796,6.37765},{-24.7756,-10.0265,5.46264},{5.75464,-9.76001,1.47425},{-23.0313,2.87158,-5.43137},{-0.398193,7.37256,-6.52535},{13.678,1.89307,-6.54251},{-7.79321,-9.53564,-2.53376},{15.3154,11.478,-2.54182},{-19.8633,12.3149,-2.54182},{-21.0286,-11.563,5.46691}};
 };

 class Land_Misc_Cargo1Ao : Industrial
@@ -438,11 +663,17 @@ class Land_Rail_House_01 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{2.81152,3.61426,-1.28265},
 		{-1.82178,3.10938,-1.28265},
-		{0.487793,3.38867,-1.28265}
+		{0.487793,3.38867,-1.28265},
+		*/
+		{-2.35864,3.04199,-1.28266}
+	};
+	lootPosSmall[] =
+	{
+		{3.13745,3.62549,-1.28266}
 	};
-	lootPosSmall[] = {{3.13745,3.62549,-1.28266}};
 };

 class Land_Barn_Metal : Industrial
@@ -461,6 +692,7 @@ class Land_Barn_Metal : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-2.00244,-3.19043,5.40768},
 		{-9.37109,-22.1816,5.57785},
 		{10.2598,22.709,5.57785},
@@ -469,9 +701,20 @@ class Land_Barn_Metal : Industrial
 		{-4.52295,-18.5713,-5.44214},
 		{-8.45898,-8.43848,-5.44214},
 		{1.78223,7.49902,-5.44214},
-		{-3.16846,14.9141,-5.44214}
+		{-3.16846,14.9141,-5.44214},
+		*/
+		{-8.18506,19.9023,-5.44214},
+		{4.70117,17.2849,-5.44214},
+		{1.31738,-7.94946,-5.44214},
+		{-7.74316,-20.5955,-5.44214}
+	};
+	lootPosSmall[] =
+	{
+		{10.5313,22.6777,5.58788},
+		{-9.65137,1.55225,5.58788},
+		{-9.48535,-25.0022,5.58788},
+		{2.83203,-25.1704,5.58788}
 	};
-	lootPosSmall[] = {{10.5313,22.6777,5.58788},{-9.65137,1.55225,5.58788},{-9.48535,-25.0022,5.58788},{2.83203,-25.1704,5.58788}};
 };

 class Land_Ind_Expedice_1 : Industrial
@@ -489,15 +732,31 @@ class Land_Ind_Expedice_1 : Industrial
 	};
 	lootPos[] =
 	{
+		/*
 		{-6.87695,-18.2285,-3.48672},
 		{-0.315918,13.1416,-3.48672},
 		{-0.5625,13.8926,9.71017},
 		{5.66846,-18.3174,-5.75726},
 		{1.67725,2.15137,-5.6839},
 		{-11.7915,-13.8818,-3.48672},
-		{0.120605,13.0664,-5.6839}
+		{0.120605,13.0664,-5.6839},
+		*/
+		{5.56104,-18.4136,-5.75725},
+		{-10.0732,-18.7891,-3.48673},
+		{-6.21045,-7.65479,-3.48673},
+		{0.0634766,-0.0908203,-5.68389},
+		{-2.59351,18.4795,-5.68389},
+		{-1.85474,13.1089,-3.48673}
+	};
+	lootPosSmall[] =
+	{
+		{6.71289,-18.1563,-5.75725},
+		{-9.12036,-17.6846,-3.48673},
+		{-7.7959,-8.31201,-3.48673},
+		{-1.51221,0.0673828,-5.68389},
+		{-2.6748,11.6543,-5.6839},
+		{-2.34814,11.9219,-3.48673}
 	};
-	lootPosSmall[] = {{6.71289,-18.1563,-5.75725},{-9.12036,-17.6846,-3.48673},{-7.7959,-8.31201,-3.48673},{-1.51221,0.0673828,-5.68389},{-2.6748,11.6543,-5.6839},{-2.34814,11.9219,-3.48673}};
 };

 class Land_A_CraneCon : Industrial
@@ -625,10 +884,7 @@ class Land_Shed_M02 : Industrial
 		{-0.0136719,-1.44629,-1.54199}
 	};
 	lootChance = 0.2;
-	lootPos[] =
-	{
-		{-0.0136719,-1.44629,-1.54199}
-	};
+	//lootPos[] = {{-0.0136719,-1.44629,-1.54199}};
 	lootPosSmall[] = {{1.00586,0.0698242,-1.01666},{-0.931641,0.0825195,-1.01755}};
 };

@@ -755,15 +1011,24 @@ class Land_sara_hasic_zbroj : Industrial
 	lootChance = 0.4;
 	lootPos[] =
 	{
+		/*
 		{5.67,1.09,-2.65},
 		{4.97,-1.94,-2.65},
 		{2.69,-2.12,-2.65},
 		{1.86,-0.47,-2.65},
 		{0.14,1.76,-2.65},
 		{-3.02,-1.3,-2.65},
-		{-0.94,-0.97,-2.65}
+		{-0.94,-0.97,-2.65},
+		*/
+		{5.92285,1.35645,-2.66287},
+		{0.00878906,-1.37549,-2.66287},
+		{-1.82715,1.93066,-2.66287}
+	};
+	lootPosSmall[] =
+	{
+		{6.81348,-2.16846,-2.66287},
+		{-3.30176,-2.49121,-2.67287}
 	};
-	lootPosSmall[] = {{6.81348,-2.16846,-2.66287},{-3.30176,-2.49121,-2.67287}};
 };

 class Land_Ind_Quarry : Industrial
@@ -776,22 +1041,15 @@ class Land_Ind_Quarry : Industrial
 		{6.38,9.22,-7.48},
 		{-7.11,3.25,-7.48}
 	};
-	lootPos[] =
-	{
-		{-4.53,-6.8,5.25},
-		{-4.36,16.23,5.26},
-		{0.74,-10.68,-7.48},
-		{-2.97,-15.79,-7.48},
-		{-7.11,3.25,-7.48},
-		{6.12,6.62,-7.48},
-		{6.38,9.22,-7.48}
-	};
+	lootPos[] = {{-4.53,-6.8,5.25},{-4.36,16.23,5.26},{0.74,-10.68,-7.48},{-2.97,-15.79,-7.48},{-7.11,3.25,-7.48},{6.12,6.62,-7.48},{6.38,9.22,-7.48},{-7.12,13.38,-7.48},{-4.55,6.12,5.29}};
 };
 //DZE ADDED BELOW
 class land_trubice: Industrial {
 	lootPos[] = {{-2.36719,2.7627,2.59438},{5.82715,3.01563,2.59438},{1.57617,0.709961,2.59438}};
 };
-class land_x_skladiste_low_tex: Industrial {
+class land_x_skladiste_low_tex: Industrial { // concrete, arc roof, broken doors
+	zedPos[] = {{12.5835,2.05273,-2.73836},{-10.9365,2.72217,-2.85032}};
+	//lootPos[] = {{12.5835,2.05273,-2.73836},{-2.45117,8.69385,-1.62253},{-10.9365,2.72217,-2.85032},{-9.50781,-9.54053,-2.85108},{-12.1572,-6.07861,-2.8506}};
 	lootPos[] = {{-8.12354,-0.32373,-2.85032},{-2.31592,-4.27539,-2.5975},{8.15527,-6.89307,-2.5975},{0.398926,4.80029,-2.82628},{-6.0249,-7.64355,-2.85032}};
 };
 class land_b_small1: Industrial {
@@ -822,9 +1080,11 @@ class land_seb_mine_near: Industrial {
 	lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
 };
 class land_molovabud1: Industrial {
-lootPos[] = {{-2.4458,2.20703,1.27995},{-4.68164,1.95508,1.27995},{-7.92822,6.29199,1.27995},{-1.81055,-1.29199,1.56745}};
+	lootPos[] = {{-2.4458,2.20703,1.27995},{-4.68164,1.95508,1.27995},{-7.92822,6.29199,1.27995},{-1.81055,-1.29199,1.56745}};
 };
-class land_f_b1: Industrial {
+class land_f_b1: Industrial { // one story garage and ramp
+	zedPos[] = {{2.6582,-3.80225,-3.08734},{3.87988,2.10889,-3.1054}};
+	//lootPos[] = {{-3.18848,-0.702148,-2.21533},{-2.42188,-4.46582,-2.21533}};
 	lootPos[] = {{-4.45996,-2.84619,-2.21533},{-1.81152,-5.01123,-2.21533},{-5.32227,-5.21875,-2.21533}};
 };

@@ -880,9 +1140,13 @@ class land_dum_istan2_02: Industrial
 };
 class LAND_garaz_bez_tanku: Industrial
 {
-	lootPos[] = {{-2.98047,0.0463867,3.41651}};
+	lootPos[] = {
+		{-2.98047,0.0463867,3.41651}
+	};
+	lootPosSmall[] = {
+		{-1.36499,-0.579102,3.42651}
+	};
 	zedPos[] = {{-5.14404,-2.02295,-1.71924},{4.92676,-2.67383,-1.71924}};
-	lootPosSmall[] = {{-1.36499,-0.579102,3.42651}};
 };

 class Land_tovarna1: Industrial
@@ -905,21 +1169,38 @@ class Land_tovarna1: Industrial
 };
 class Land_Ind_Garage01_EP1: Industrial
 {
-	lootPos[] = {{1.65088,2.49048,-1.23114}};
+	lootPos[] = {
+		{1.65088,2.49048,-1.23114}
+	};
+	lootPosSmall[] = {
+		{2.89014,2.49634,-1.12063},
+		{2.84814,3.43677,-1.12102},
+		{1.39063,3.59766,-0.391855},
+		{1.57227,3.61353,0.368147},
+		{1.7251,3.61353,-1.15185}
+	};
 	zedPos[] = {{0.125488,0.557861,-0.357141},{1.11084,-1.33643,-0.36116}};
-	lootPosSmall[] = {{2.89014,2.49634,-1.12063},{2.84814,3.43677,-1.12102},{1.39063,3.59766,-0.391855},{1.57227,3.61353,0.368147},{1.7251,3.61353,-1.15185}};
 };

 class land_mbg_garage_single_b: Industrial {
-	lootPos[] = {{2.54492,3.97607,-1.03899},{4.13672,-0.0625,-1.03899}};
+	lootPos[] = {
+		{2.54492,3.97607,-1.03899},
+		{4.13672,-0.0625,-1.03899}
+	};
+	lootPosSmall[] = {
+		{4.50586,2.56982,-1.03899}
+	};
 	zedPos[] = {{2.96094,6.3374,-0.133815}};
-	lootPosSmall[] = {{4.50586,2.56982,-1.03899}};
 };
 class Land_House_C_12_EP1: Industrial
 {
-	lootPos[] = {{-3.27197,-1.5813,-3.50101},{-2.09863,-6.13086,-3.52102},{-2.979,-8.6936,0.141808},{-2.66602,-3.0437,0.139957},{5.91016,-3.59204,0.132626},{2.33154,-1.00244,-3.51937}};
+	lootPos[] = {
+		{-3.27197,-1.5813,-3.50101},{-2.09863,-6.13086,-3.52102},{-2.979,-8.6936,0.141808},{-2.66602,-3.0437,0.139957},{5.91016,-3.59204,0.132626},{2.33154,-1.00244,-3.51937}
+	};
+	lootPosSmall[] = {
+		{-4.03857,-2.06226,-2.43102},{-4.02344,-1.44019,-3.11102},{-3.55371,-0.618164,-3.29102},{7.38184,0.690674,-3.12101},{-2.99268,-6.54883,3.45573},{7.58105,-2.40894,0.112629},{-1.79004,-3.58325,0.128376},{-2.05713,-9.00806,0.150394}
+	};
 	zedPos[] = {{2.11182,-8.16724,1.00763},{1.85498,-3.48828,-2.63601},{-2.74854,0.133301,-2.63601},{2.65674,-5.69165,-2.63601},{-2.60742,-7.35913,1.0174}};
-	lootPosSmall[] = {{-4.03857,-2.06226,-2.43102},{-4.02344,-1.44019,-3.11102},{-3.55371,-0.618164,-3.29102},{7.38184,0.690674,-3.12101},{-2.99268,-6.54883,3.45573},{7.58105,-2.40894,0.112629},{-1.79004,-3.58325,0.128376},{-2.05713,-9.00806,0.150394}};
 };
 class Land_Ind_Oil_Pump_EP1: Industrial
 {
@@ -945,9 +1226,13 @@ class Land_Ind_PowerStation_EP1: Industrial {
 	lootPos[] = {{4.04248,-3.4917,-1.26547},{3.8645,3.5249,-1.28112}};
 };
 class land_repair_center: Industrial  {
-	lootPos[] = {{0.327148,1.65479,-2.37888},{-2.35547,-0.163574,-1.71927},{-2.41016,4.45654,-1.71927}};
+	lootPos[] = {
+		{0.327148,1.65479,-2.37888},{-2.35547,-0.163574,-1.71927},{-2.41016,4.45654,-1.71927}
+	};
+	lootPosSmall[] = {
+		{1.80469,2.01709,-1.6489},{1.60352,4.57178,-0.862885},{0.771484,4.55713,-0.48288},{1.56348,4.50439,-1.24289}
+	};
 	zedPos[] = {{0.982422,-0.634277,-1.51389}};
-	lootPosSmall[] = {{1.80469,2.01709,-1.6489},{1.60352,4.57178,-0.862885},{0.771484,4.55713,-0.48288},{1.56348,4.50439,-1.24289}};
 };

 class Land_Ind_TankBig: Industrial
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp
@@ -5,11 +5,11 @@ class Military : Default
 	zombieClass[] =
 	{
 		"z_soldier",
-		"z_soldier_heavy",
+		"z_soldier",
+		"z_soldier",
 		"z_policeman",
-		"z_new_worker2",
-		"z_new_worker3",
-		"z_new_worker4"
+		"z_soldier_heavy",
+		"z_soldier_heavy"
 	};
 	lootChance = 0.4;
 	lootGroup = Military;
@@ -22,88 +22,161 @@ class MilitarySpecial : Military
 	zombieClass[] =
 	{
 		"z_soldier_heavy",
-		"z_new_worker2",
-		"z_new_worker3",
-		"z_new_worker4"
+		"z_soldier_heavy",
+		"z_soldier_heavy",
+		"z_soldier"
 	};
 	lootChance = 0.4;
 	lootGroup = MilitarySpecial;
 };
-class MilitaryIndustrial: Military {
+class MilitaryIndustrial: Military 
+{
 	zombieChance = 0.3;
 	maxRoaming = 6;
-	zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"};
-	lootChance = 0.4;
+	zombieClass[] = 
+	{
+		"z_soldier",
+		"z_soldier_heavy",
+		"z_soldier",
+		"z_worker1",
+		"z_worker2",
+		"z_worker3"
+	};
+	lootChance = 0.5;
 	lootGroup = MilitaryIndustrial;
 };
 class Land_a_stationhouse : Military
 {
 	zedPos[] = {{-0.892578,-5.7168,-9.47058},{1.5127,1.96484,-9.47058},{18.9063,-4.06738,-9.47058},{-2.69922,-7.57422,-9.46057},{-1.35645,-8.3623,-4.6489},{-3.24219,-6.61914,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39453,-7.88281,-0.0437927},{-1.37891,-5.79102,4.41141},{-1.39648,-7.79883,4.41141}};
-	lootChance = 0.3;
-	lootPos[] = {{-2.7,-7.57,-9.46},{-0.89,-5.72,-9.47},{-3.24,-6.62,-4.65},{-1.36,-8.36,-4.65},{-1.71,-7.85,-0.04},{-3.39,-7.88,-0.04},{-1.4,-7.8,4.41},{-1.38,-5.79,4.41},{1.51,1.96,-9.47},{18.91,-4.07,-9.47},{-14.4,3.29,-0.51},{1.33,0.89,-0.51},{-2.4,-6.64,8.49}};
-	lootPosSmall[] = {{14.6826,3.55029,-8.25058},{9.97266,3.48584,-9.40058},{19.1477,-6.69629,-9.36058},{19.1719,-7.47998,-9.36058},{0.513672,1.19336,-9.39058},{0.51416,3.3418,-8.63058},{0.52124,1.92334,-7.87058},{-1.63623,-8.99756,-9.39058},{-3.5647,-9.01855,-8.63058},{-0.76709,-8.99072,-7.87058},{-2.40137,-9.03027,-8.25058},{-4.50391,-5.27588,-4.6489},{-1.02393,-9.02051,0.0562134},{-0.771484,-8.3335,0.0762138},{-0.7229,-9.03076,1.19621},{-4.40308,-8.7666,4.41139},{-2.27783,-5.35303,4.41139},{-4.4541,-8.81055,8.49209},{9.12549,3.64697,-8.25058}};
+	lootChance = 0.5;
+	lootPos[] = {
+		//{-2.7,-7.57,-9.46},{-0.89,-5.72,-9.47},{-3.24,-6.62,-4.65},{-1.36,-8.36,-4.65},{-1.71,-7.85,-0.04},{-3.39,-7.88,-0.04},{-1.4,-7.8,4.41},{-1.38,-5.79,4.41},{1.51,1.96,-9.47},{18.91,-4.07,-9.47},{-14.4,3.29,-0.51},{1.33,0.89,-0.51},{-2.37,-8.4,8.49},{12.44,2.54,-9.47},{-14.83,-7.58,-0.51},{-1.8,8.87,-0.51},{6.83,0.89,-0.51},{3.65,-6.54,-4.51},{16.29,-6.57,-4.51},{18.39,2.37,-4.51},{9.28,-1.25,-4.51},{-2.08,-4.74,8.49},
+		{15.436,2.85498,-9.47058},{17.9861,-6.52832,-9.47058},{1.22583,2.24463,-9.47058},{-3.9126,-7.29834,-9.47058},{-2.28271,-6.21094,-4.6489},{-1.604,-8.68018,-0.043786},{-1.104,-5.60938,4.41139},{-3.55811,-8.56787,4.41139},{-2.99219,-8.27148,8.49209}
+	};
+	lootPosSmall[] = {
+		{14.6826,3.55029,-8.25058},{9.97266,3.48584,-9.40058},{19.1477,-6.69629,-9.36058},{19.1719,-7.47998,-9.36058},{0.513672,1.19336,-9.39058},{0.51416,3.3418,-8.63058},{0.52124,1.92334,-7.87058},{-1.63623,-8.99756,-9.39058},{-3.5647,-9.01855,-8.63058},{-0.76709,-8.99072,-7.87058},{-2.40137,-9.03027,-8.25058},{-4.50391,-5.27588,-4.6489},{-1.02393,-9.02051,0.0562134},{-0.771484,-8.3335,0.0762138},{-0.7229,-9.03076,1.19621},{-4.40308,-8.7666,4.41139},{-2.27783,-5.35303,4.41139},{-4.4541,-8.81055,8.49209},{9.12549,3.64697,-8.25058}
+	};
 };

 class Land_Mil_ControlTower: Military
 {
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
 	zedPos[] = {{10.0703,3.76367,-9.62869},{1.75195,5.68164,-5.51373},{3.85254,3.53516,-5.50372},{6.66113,-0.625488,-1.0787},{6.72266,3.23389,-1.0787},{2.63965,-0.191406,-1.0687}};
 	lootChance = 0.4;
-	lootPos[] = {{10.0703,3.76367,-9.62869},{3.85254,3.53516,-5.50372},{1.75195,5.68164,-5.51373},{6.66113,-0.625488,-1.0787},{2.63965,-0.191406,-1.0687},{6.72266,3.23389,-1.0787}};
-	lootPosSmall[] = {{7.32324,-1.55957,2.98267},{5.49023,-1.72949,-0.378693},{4.7334,-1.66064,-0.378693},{7.44922,2.03809,-0.378693},{5.86035,3.98438,-0.248688},{6.21289,4.02539,-1.0087},{4.96875,-1.39941,-0.638702},{1.08008,3.98389,-5.51367},{10.0879,3.5459,-9.64868}};
+	lootPos[] = {
+		//{10.07,3.76,-9.63},{5.07,3.65,-5.5},{1.75,5.68,-5.51},{7.49,-1.47,-1.04},{2.46,-0.83,-1.07},{7.61,2.05,-0.35},{2.26,2.17,-1.07},{2.56,5.72,-9.63},{6.56,-3.82,-1.06},{9.87,4.04,-1.06},{7.28,-1.69,2.98},
+		{7.33203,-1.104,-1.0787},{2.00684,-0.88623,-1.0787},{6.10938,3.34473,-1.0787},{1.90332,3.67188,-5.51367},{8.71387,3.8042,-9.6387}
+	};
+	lootPosSmall[] = {
+		{7.32324,-1.55957,2.98267},{5.49023,-1.72949,-0.378693},{4.7334,-1.66064,-0.378693},{7.44922,2.03809,-0.378693},{5.86035,3.98438,-0.248688},{6.21289,4.02539,-1.0087},{4.96875,-1.39941,-0.638702},{1.08008,3.98389,-5.51367},{10.0879,3.5459,-9.64868}
+	};
 };

 class Land_SS_hangar: Military
 {
+	zombieClass[] = 
+	{
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_worker1",
+		"z_worker2",
+		"z_worker3"
+	};
 	maxRoaming = 3;
 	zedPos[] = {{-11.7158,-18.9541,-5.87253},{11.7344,-17.165,-5.87253},{-14.2461,23.0439,-5.87253}};
 	lootChance = 0.4;
-	lootPos[] = {{11.73,-17.17,-5.87},{-11.72,-18.95,-5.87},{-14.25,23.04,-5.87},{8.38,-5.33,-5.87},{-6,5.89,-5.87},{10.18,19.62,-5.87},{-6.43,-7.66,-5.87}};
-	lootPosSmall[] = {{-14.1362,12.6729,-5.87253},{14.4819,-7.80371,-5.87253}};
+	lootPos[] = {
+		//{11.73,-17.17,-5.87},{-11.72,-18.95,-5.87},{-14.25,23.04,-5.87},{8.38,-5.33,-5.87},{-6,5.89,-5.87},{10.18,19.62,-5.87},{-6.43,-7.66,-5.87},
+		{-13.0562,-17.6318,-5.87253},{-12.9907,20.873,-5.87253},{12.7217,22.6377,-5.87253},{1.80469,3.94238,-5.87253},{13.1997,-18.3457,-5.87253}
+	};
+	lootPosSmall[] = {
+		{-14.1362,12.6729,-5.87253},{14.4819,-7.80371,-5.87253}
+	};
 	lootGroup = Hangar;
 };

 class Land_A_TVTower_Base: Military
 {
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
 	zedPos[] = {{-0.95166,1.48047,-2.31586},{-2.01782,-4.24121,-2.30939},{-0.982422,-1.92383,-2.25586}};
-	lootPos[] = {{-0.982422,-1.92383,-2.25586},{-2.01782,-4.24121,-2.30939},{-0.95166,1.48047,-2.31586}};
+	//lootPos[] = {{-0.982422,-1.92383,-2.25586},{-2.01782,-4.24121,-2.30939},{-0.95166,1.48047,-2.31586}};
+	lootPos[] = {{-0.982422,-1.92627,-2.21573},{-2.01782,-4.2417,-2.21918},{-0.759277,1.42139,-2.21573}};
 };

 class Land_Mil_House: Military
 {
+		zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
 	zedPos[] = {{11.1638,4.70117,-5.67465},{12.4565,1.42383,-5.67465},{13.6672,4.42383,-5.67465}};
-	lootPos[] = {{12.4565,1.42383,-5.67465},{11.1638,4.70117,-5.67465},{13.6672,4.42383,-5.67465}};
-	lootPosSmall[] = {{-10.4692,4.4082,-4.94623},{-10.3696,1.2627,-4.46622},{-6.47998,4.92871,-4.98621},{-13.3208,-0.803711,-4.98621},{-13.791,-6.27832,-0.88623},{-13.2046,-5.36426,-0.196228},{-9.45166,-6.02832,-0.88623},{-0.253418,-4.12402,-0.88623},{-4.75635,-0.0224609,-0.88623},{-6.02002,-0.0410156,-0.426239},{-2.28857,0.575195,-0.876221}};
+	lootPos[] = {
+		//{12.4565,1.42383,-5.67465},{11.1638,4.70117,-5.67465},{13.6672,4.42383,-5.67465},
+		{-14.3345,1.24414,-4.94623},{-7.87842,1.45117,-4.15622},{-7.77686,-5.34277,-0.88623},{-4.43506,-5.33594,-0.88623}
+	};
+	lootPosSmall[] = {
+		{-10.4692,4.4082,-4.94623},{-10.3696,1.2627,-4.46622},{-6.47998,4.92871,-4.98621},{-13.3208,-0.803711,-4.98621},{-13.791,-6.27832,-0.88623},{-13.2046,-5.36426,-0.196228},{-9.45166,-6.02832,-0.88623},{-0.253418,-4.12402,-0.88623},{-4.75635,-0.0224609,-0.88623},{-6.02002,-0.0410156,-0.426239},{-2.28857,0.575195,-0.876221}
+	};
 };

 class Land_Mil_Barracks_i: MilitarySpecial
 {
 	zedPos[] = {{-1.95361,2.57813,-1.1084},{5.46289,2.5791,-1.1084},{1.29346,-2.16211,-1.09839},{-1.78369,-0.166992,-1.09839},{-5.39355,-2.11719,-1.09839},{-5.4707,2.58203,-1.09839},{-1.80664,-1.97559,-1.09827},{5.38965,-1.75781,-1.09827},{-9.1499,-2.55859,-1.09827},{1.4668,-0.129883,-1.09814},{-4.77881,0.0498047,-1.09814},{-8.32617,-0.144531,-1.09814}};
 	lootChance = 0.3;
-	lootPos[] = {{-0.39,-2.02,-1.1},{-5.67,1.68,-1.1},{-1.95,2.58,-1.11},{5.46,2.58,-1.11},{6.37,-1.22,-0.93},{-0.24,-1.04,0.1},{-3.53,-0.38,-1.1},{-5.39,-2.23,-1.1},{-6.78,-1.34,-0.7},{-9.07,-0.53,-1.1},{2.97,-0.92,-1.1},{1.11,-2.35,-1.1}};
-	lootPosSmall[] = {{3.88037,-0.905273,-0.358246},{6.48242,-2.51367,-0.978241},{3.03662,-1.78418,-0.698242},{-0.179199,0.488281,-1.10825},{-3.20703,-0.101563,-1.11823},{-3.37061,-1.08887,0.0917664},{-6.79297,-2.63086,-1.09824},{-9.29541,-0.212891,-1.09824}};
+	lootPos[] = {
+		//{-0.39,-2.02,-1.1},{-5.67,1.68,-1.1},{-1.95,2.58,-1.11},{5.46,2.58,-1.11},{6.37,-1.22,-0.93},{-0.24,-1.04,0.1},{-3.53,-0.38,-1.1},{-5.39,-2.23,-1.1},{-6.78,-1.34,-0.7},{-9.07,-0.53,-1.1},{2.97,-0.92,-1.1},{1.11,-2.35,-1.1},
+		{4.56494,-2.67383,-1.14822},{0.312988,1.54492,-1.09824},{-2.95361,1.49414,-1.11823},{-3.39111,-1.99023,-0.708221},{-6.68604,-1,0.0917664},{-8.94238,-2.52441,-1.09824},{-0.59668,-1.49609,-1.10825},{3.03467,-1.00586,0.0917664},{-0.214355,-2.19531,0.0917664},{-8.93018,1.53906,-1.09824}
+	};
+	lootPosSmall[] = {
+		{3.88037,-0.905273,-0.358246},{6.48242,-2.51367,-0.978241},{3.03662,-1.78418,-0.698242},{-0.179199,0.488281,-1.10825},{-3.20703,-0.101563,-1.11823},{-3.37061,-1.08887,0.0917664},{-6.79297,-2.63086,-1.09824},{-9.29541,-0.212891,-1.09824}
+	};
 };

 class Land_Mil_Barracks: Military { //DZE added, was just {};
-	lootPos[] = {{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}};
+	lootPos[] = {
+		{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}
+	};
+	lootPosSmall[] = {
+		{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}
+	};
 	zedPos[] = {{-2.15845,-3.12793,-1.06134},{2.13281,3.24316,-1.06134},{-6.20679,-0.125,-1.06134},{2.09521,-3.36719,-1.06134}};
-	lootPosSmall[] = {{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}};
 };
+
 class Camp: Military {
 	maxRoaming = 1;
 	zedPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
-	lootPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
+	//lootPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
+	lootPos[] = {{0.833252,-1.52246,-1.09949},{0.38501,0.963867,-1.08948}};
 };

+class Land_stan: Camp {};
+
 class CampEast: Military {
 	maxRoaming = 1;
 	zedPos[] = {{0.627441,1.83594,-1.31049},{-1.05713,-1.80762,-1.31049}};
-	lootPos[] = {{-1.05713,-1.80762,-1.31049},{0.627441,1.83594,-1.31049}};
+	//lootPos[] = {{-1.05713,-1.80762,-1.31049},{0.627441,1.83594,-1.31049}};
+	lootPos[] = {{-1.05713,-1.80762,-1.31049},{0.627441,1.83398,-1.31049}};
 };

 class CampEast_EP1: Military {
 	maxRoaming = 1;
 	zedPos[] = {{-0.670898,0.955078,-1.31049},{1.68408,-2.43359,-1.31049},{-1.76318,-1.625,-1.31049}};
-	lootPos[] = {{-0.670898,0.955078,-1.31049},{1.68408,-2.43359,-1.31049},{-1.76318,-1.625,-1.31049}};
+	//lootPos[] = {{-0.670898,0.955078,-1.31049},{1.68408,-2.43359,-1.31049},{-1.76318,-1.625,-1.31049}};
+	lootPos[] = {{-0.670898,0.95459,-1.31049},{1.68506,-2.43384,-1.31049},{-1.76318,-1.62646,-1.31049}};
 };

 class Land_tent_east: Military {
@@ -121,6 +194,7 @@ class Land_Dam_ConcP_20: Military {
 };

 class C130J_wreck_EP1: Military {
+	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
 	zedPos[] = {{0.37,0.61,-5.44},{-0.84,2.92,-5.44},{-2.16,-6.32,-5.42},{1.26,-20.49,-5.39},{1.88,-3.67,-5.36},{-0.2,-12.76,-4.78},{-0.36,-7.87,-4.6},{-1.32,-14.56,-4.59}};
 	lootPos[] = {{-0.36,-7.87,-4.6},{-0.2,-12.76,-4.78},{-1.32,-14.56,-4.59},{-2.16,-6.32,-5.42},{-0.84,2.92,-5.44},{0.37,0.61,-5.44},{1.88,-3.67,-5.36},{1.26,-20.49,-5.39}};
 };
@@ -130,6 +204,7 @@ class Barrack2: Military {
 };

 class Mi8Wreck: Military {
+	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
 	lootPos[]={{0,-5.79,-1.71}};
 };

@@ -147,15 +222,55 @@ class Land_Mil_Barracks_L: Military {
 	zedPos[] = {{4,-5.22,-2.21},{7.3,-4.04,-2.21},{-0.82,-4.72,-2.2}};
 	lootPos[] = {{-0.82,-4.72,-2.2},{4,-5.22,-2.21},{7.3,-4.04,-2.21}};
 };
+// ALT-MAP Support 
+class Land_kostel_trosky: MilitarySpecial // church ruins
+{
+	zedPos[] = {{-0.388672,10.0176,-5.37072},{-2.97852,-0.816406,-5.55207}};
+	lootPos[] = {{0.386719,13.5918,-5.54349},{3.81055,2.98828,-5.30816}};
+};
+class Land_MBG_Killhouse_3: Military // cement 2 story 
+{
+	zedPos[] = {{-4.10547,-0.466797,0.451439},{-2.06152,3.2168,0.451439},{-10.7031,3.0293,0.451439},{-8.07715,-1.2168,0.451439}};
+	lootPos[] = {{-4.10547,-0.466797,0.451439},{-2.06152,3.2168,0.451439},{-10.7031,3.0293,0.451439},{-8.07715,-1.2168,0.451439}};
+};
+class Land_aif_strazni_vez: Military // metal platform-overlook 
+{
+	lootPos[] = {{0.113281,0.859375,1.46157},{-1.24023,1.25195,1.46157}};
+};
+class Land_MBG_Killhouse_2: Military // cement 2 story 
+{
+	zedPos[] = {{-4.58887,-4.49023,-2.79856},{1.78516,1.58887,3.80144}};
+	lootPos[] = {{-4.58887,-4.49023,-2.79856},{6.50488,5.86328,-2.79856},{-6.24365,-4.69336,0.501437},{-4.99805,-4.63281,3.80144},{5.48828,-3.87793,3.80144}};
+};
+class Land_buova4_winter: MilitarySpecial // winter version of military barracks
+{
+	zedPos[] = {{-1.95361,2.57813,-1.1084},{5.46289,2.5791,-1.1084},{1.29346,-2.16211,-1.09839},{-1.78369,-0.166992,-1.09839},{-5.39355,-2.11719,-1.09839},{-5.4707,2.58203,-1.09839},{-1.80664,-1.97559,-1.09827},{5.38965,-1.75781,-1.09827},{-9.1499,-2.55859,-1.09827},{1.4668,-0.129883,-1.09814},{-4.77881,0.0498047,-1.09814},{-8.32617,-0.144531,-1.09814}};
+	lootChance = 0.3;
+	lootPos[] = {{-0.39,-2.02,-1.1},{-5.67,1.68,-1.1},{-1.95,2.58,-1.11},{5.46,2.58,-1.11},{6.37,-1.22,-0.93},{-0.24,-1.04,0.1},{-3.53,-0.38,-1.1},{-5.39,-2.23,-1.1},{-6.78,-1.34,-0.7},{-9.07,-0.53,-1.1},{2.97,-0.92,-1.1},{1.11,-2.35,-1.1}};
+};
+class land_hlaska: Military // metal platform
+{
+	lootChance = 0.3;
+	lootPos[] = {{-0.802246,0.614258,3.77092},{0.917969,0.9375,3.77093}};
+};
+// ALT-MAP Support 

 //DZE ADDED BELOW
-class land_pozorovatelna: Military {
+class land_pozorovatelna: Military { // concrete tower
+	//lootChance = 0.3;
+	//lootPos[] = {{-0.717773,-3.02612,-2.49767},{2.99414,2.67017,-2.49767},{0.761719,-2.20044,7.54509},{-0.482422,1.19702,7.54508},{1.85156,1.9812,7.54508}};
 	lootPos[] = {{-2.36328,-2.79248,-2.49767},{3.11426,-2.92969,-2.49767},{0.740234,2.47852,-2.49767},{-1.67578,-2.50049,7.54509},{-1.23047,1.90283,7.54509},{2.88477,2.08496,7.54509},{2.61426,-2.48096,7.54509},{0.491211,-0.290527,7.54509}};
 };
 class land_AII_last_floor: MilitarySpecial {
+	zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
+	lootChance = 0.5;
+	maxRoaming = 3;
 	lootPos[] = {{-1.73975,-7.99756,11.6976},{-1.73975,-7.99756,11.6976},{-1.20801,5.45605,4.6129},{-3.82813,2.81494,5.46183}};
 };
 class land_AII_middle_floor: MilitarySpecial {
+	zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
+	lootChance = 0.5;
+	maxRoaming = 3;
 	lootPos[] = {{-7.64941,4.97412,0.510368},{-7.7207,5.10498,0.510216},{-7.27979,-0.931152,0.518509},{8.47461,-2.3252,-4.63377},{9.20508,0.508301,-4.63377},{4.36768,3.7998,-4.63377},{-0.669434,2.74805,-4.63377},{-10.3594,5.03516,-4.63377},{-13.9766,9.10059,-4.63377},{-8.021,1.22314,-4.63377},{6.07227,-2.64551,-4.63377},{-8.75293,8.79297,-2.10379}};
 };
 class Land_budova4_winter: MilitarySpecial {
@@ -165,39 +280,70 @@ class land_vstup: Military {
 	lootPos[] = {{-11.51,-2.64844,-1.53312},{-6.24463,-2.85059,-1.53312},{-1.16992,-2.84961,-1.53312},{2.70898,-2.85059,-1.53312}};
 };
 class land_smd_hlaska: Military {
-	lootPos[] = {{-0.724609,0.822266,3.77092}};
+	lootPos[] = {
+		{-0.724609,0.822266,3.77092}
+	};
+	lootPosSmall[] = {
+		{1.06201,-0.864258,3.77092},
+		{-1.04688,-0.759766,3.77092}
+	};
 	zedPos[] = {{-0.18457,-3.13574,-2.25991}};
-	lootPosSmall[] = {{1.06201,-0.864258,3.77092},{-1.04688,-0.759766,3.77092}};
 };
 class land_smd_army_hut2: Military {
-	lootPos[] = {{0.447266,-4.6543,-1.33328}};
+	lootPos[] = {
+		{0.447266,-4.6543,-1.33328}
+	};
+	lootPosSmall[] = {
+		{-0.257813,-5.02539,-0.623276},
+		{3.02832,-6.1582,-1.33328}
+	};
 	zedPos[] = {{0.552734,6.06836,-0.515976},{-3.86816,-5.6875,-1.13228}};
-	lootPosSmall[] = {{-0.257813,-5.02539,-0.623276},{3.02832,-6.1582,-1.33328}};
 };
 class land_smd_ss_hangard_withdoor: MilitaryIndustrial {
-	lootPos[] = {{0.236328,3.4209,-5.87254},{-14.0732,22.499,-5.87254},{13.1895,22.2031,-5.87254},{-13.8877,-10.5459,-5.87254},{2.10742,-19.8496,-5.87254}};
+	lootPos[] = {
+		{0.236328,3.4209,-5.87254},{-14.0732,22.499,-5.87254},{13.1895,22.2031,-5.87254},{-13.8877,-10.5459,-5.87254},{2.10742,-19.8496,-5.87254}
+	};
+	lootPosSmall[] = {
+		{14.3984,12.2852,-5.87254},{0.289063,-0.197266,-5.87254},{-14.8389,-20.6475,-5.87254},{14.8574,-20.5088,-5.87254}
+	};
 	zedPos[] = {{0.128906,-25.0273,-5.42465},{-16.7891,1.98145,-5.42465},{0.0742188,26.5654,-5.42465},{16.6631,-7.1084,-5.42465}};
-	lootPosSmall[] = {{14.3984,12.2852,-5.87254},{0.289063,-0.197266,-5.87254},{-14.8389,-20.6475,-5.87254},{14.8574,-20.5088,-5.87254}};
 };
 class land_budova5: Military {
-	lootPos[] = {{-2.04004,2.89844,-1.98059}};
+	lootPos[] = {
+		{-2.04004,2.89844,-1.98059}
+	};
+	lootPosSmall[] = {
+		{-1.96191,-0.314453,-1.98059}
+	};
 	zedPos[] = {{-3.04492,2.0332,-1.40211}};
-	lootPosSmall[] = {{-1.96191,-0.314453,-1.98059}};
 };
 class land_smd_army_hut2_int: Military {
-	lootPos[] = {{-0.848633,-1.24316,-0.948334},{-1.92383,-0.00390625,-0.948334},{2.7959,-0.0146484,-0.948334}};
+	lootPos[] = {
+		{-0.848633,-1.24316,-0.948334},{-1.92383,-0.00390625,-0.948334},{2.7959,-0.0146484,-0.948334}
+	};
+	lootPosSmall[] = {
+		{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}
+	};
 	zedPos[] = {{-3.35352,-2.65332,-0.407364},{0.475586,3.37402,-0.350555}};
-	lootPosSmall[] = {{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}};
 };
 class land_smd_strazni_vez: Military {
-	lootPos[] = {{-1.68066,-1.30273,2.00299}};
+	lootPos[] = {
+		{-1.68066,-1.30273,2.00299}
+	};
+	lootPosSmall[] = {
+		{-0.902344,-1.29395,1.41299},
+		{-1.92578,1.28613,1.41299}
+	};
 	zedPos[] = {{-1.14844,0.125977,2.28799},{1.04102,2.45898,-1.76974}};
-	lootPosSmall[] = {{-0.902344,-1.29395,1.41299},{-1.92578,1.28613,1.41299}};
 };
 class land_smd_army_hut3_long_int: Military {
-	lootPos[] = {{0.643555,5.24219,-0.0739136},{-2.78809,3.13672,-1.27391},{-2.80957,5.27441,-0.863907},{-3.13086,-3.3584,-1.27391},{-0.875977,-0.6875,-1.27391}};
+	lootPos[] = {
+		{0.643555,5.24219,-0.0739136},{-2.78809,3.13672,-1.27391},{-2.80957,5.27441,-0.863907},{-3.13086,-3.3584,-1.27391},{-0.875977,-0.6875,-1.27391}
+	};
+	lootPosSmall[] = {
+		{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}
+	};
 	zedPos[] = {{3.37598,0.145508,-0.938461},{-4.52734,0.833984,-1.2229}};
-	lootPosSmall[] = {{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}};
 };

 class land_st_vez: MilitarySpecial {
@@ -214,19 +360,29 @@ class land_ibr_hangar: MilitaryIndustrial
 };
 class land_ind_pec_03: MilitaryIndustrial
 {
-	lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}};
+	lootPos[] = {
+		{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}
+	};
+	lootPosSmall[] = {
+		{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}
+	};
 	zedPos[] = {{1.979,15.7012,3.48646},{5.93604,16.2686,3.48582},{6.50586,13.8198,-4.22628},{12.314,9.64258,-4.22628},{6.15381,9.78711,-4.22628},{6.34424,-2.52051,-0.953124},{-5.04004,-4.30566,-4.22628},{-5.77588,-21.0293,-4.22628}};
-	lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}};
 };
 class land_ind_pec_03a: MilitaryIndustrial
 {
-	lootPos[] = {{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}};
+	lootPos[] = {
+		{6.07275,11.8623,2.59973},{7.82275,-2.04883,-1.9376},{13.1899,16.0693,-5.15128},{14.0396,8.12549,-5.15128},{13.8237,12.5366,-4.69128},{4.63086,16.6553,-2.04201},{3.07275,-5.11963,-5.15128},{4.79541,-2.07031,-1.9387},{3.67627,14.5518,2.60131},{-2.08447,-13.6855,1.11455},{3.21484,8.37207,-5.15128},{4.78662,18.0498,-5.15128},{-3.98193,-24.5332,-5.15128},{12.9028,-1.58447,3.05404},{-0.259766,22.2715,4.05607},{1.96094,25.4209,4.05607}
+	};
+	lootPosSmall[] = {
+		{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}
+	};
 	zedPos[] = {{1.979,15.7012,3.48646},{5.93604,16.2686,3.48582},{6.50586,13.8198,-4.22628},{12.314,9.64258,-4.22628},{6.15381,9.78711,-4.22628},{6.34424,-2.52051,-0.953124},{-5.04004,-4.30566,-4.22628},{-5.77588,-21.0293,-4.22628}};
-	lootPosSmall[] = {{2.1709,11.5796,2.75019},{1.17725,11.8911,3.87051},{6.62451,13.2251,4.24952},{3.21777,-11.7026,-1.85671},{8.35938,-3.10693,-1.93559},{14.1851,-5.31348,-1.08754},{13.0874,16.7339,-4.27128},{7.37207,16.6235,-4.99128},{11.6133,16.7075,-5.04128},{12.248,13.2998,-3.56128},{-15.2876,-18.2754,-5.06128},{3.3833,14.4814,3.36135},{10.6797,7.66943,-4.43128},{-4.56982,14.9658,-4.94128},{4.23242,-26.7783,-1.97225},{2.2749,21.8086,4.05607}};
 };

-class Land_budova4_in: Military
+class Land_budova4_in: Military // barracks broken blue front door. cannot enter inner rooms
 {
+	zedPos[] = {{-3.94531,2.27344,-1.88723},{-0.0566406,2.2666,-1.88723},{6.27148,2.5752,-1.88723}};
+	//lootPos[] = {{-5.49609,2.13135,-1.88723},{-1.57031,2.29199,-1.88723},{2.43945,2.21387,-1.88723},{5.92383,-2.44678,-1.88723}};
 	lootPos[] = {
 		{ -6.50415,2.1416,-1.88723 },
 		{ -1.66162,2.10168,-1.88723 },
@@ -278,6 +434,12 @@ class Land_vez: Military

 class Land_Mil_ControlTower_EP1: Military
 {
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
 	lootChance = 0.4;
 	lootPos[] = {
 		{ 5.53369,3.64355,-5.46368 },
@@ -291,11 +453,27 @@ class Land_Mil_ControlTower_EP1: Military
 };
 class Land_Mil_hangar_EP1: MilitaryIndustrial
 {
+	zombieClass[] = 
+	{
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_worker1",
+		"z_worker2",
+		"z_worker3"
+	};
 	maxRoaming = 3;
 	lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
 };
 class Land_Mil_Guardhouse_EP1: Military
 {
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
 	lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
 };
 class Land_Mil_Barracks_i_EP1: MilitarySpecial
@@ -320,11 +498,22 @@ class Land_fortified_nest_big_EP1: Military

 class Land_Mil_House_EP1: Military
 {
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
 	vehPos[] = {
 		{ 13.439,3.25244,-5.71244,84 }};
-	lootPos[] = {{11.7949,4.3147,-5.81439}};
+	lootPos[] = {
+		{11.7949,4.3147,-5.81439}
+	};
+	lootPosSmall[] = {
+		{-1.54785,5.46997,-5.00406},
+		{-2.61816,5.46362,-5.0097}
+	};
 	zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
-	lootPosSmall[] = {{-1.54785,5.46997,-5.00406},{-2.61816,5.46362,-5.0097}};
 };
 class datsun02Wreck: Military
 {
@@ -337,7 +526,7 @@ class datsun02Wreck: Military
 };
 class HMMWVWreck: Military
 {
-	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
+	zombieClass[] = {"z_soldier","z_soldier_heavy"};
 	zombieChance = 0.3;
 	lootChance = 0;
 	minRoaming = 1;
@@ -345,12 +534,24 @@ class HMMWVWreck: Military
 	lootPos[] = {};
 };

-class Land_Mil_Guardhouse : Military //MOVED FROM RESIDENTIAL
+class Land_Mil_Guardhouse: Military //MOVED FROM RESIDENTIAL
 {
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootChance = 0.5;
 	maxRoaming = 3;
 	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
-	lootPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
-	lootPosSmall[] = {{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}};
+	lootPos[] = {
+		//{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}
+		{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}
+	};
+	lootPosSmall[] = {
+		{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}
+	};
 };

 class UH1Wreck_DZ: Military {
@@ -405,4 +606,4 @@ class UH60_ARMY_Wreck_burned_DZ: Military {
 	minRoaming = 4;
 	maxRoaming = 8;
 	lootPos[] = {};
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Office.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Office.hpp
@@ -9,45 +9,88 @@ class Office : Residential
 class Land_HouseB_Tenement : Office
 {
 	//lootPos[] = {{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{-12.0771,0.645508,-20.7845},{-0.924805,5.26563,-20.7845}};
-	lootPos[] = {{5.41,9.89,-20.78},{5.99,14.17,-20.78},{12.96,14.07,-20.78},{14.61,8.92,-20.78},{-12.08,0.65,-20.78},{-0.92,5.27,-20.78},{1.27,-0.62,-20.78},{-2.28,2.08,-20.78},{-10.07,4.64,-20.78},{5.35,3.42,-20.78},{13.35,3.37,-20.78},{2.53,-5.75,-20.78}};
+	lootPos[] = {
+		//{5.41,9.89,-20.78},{5.99,14.17,-20.78},{12.96,14.07,-20.78},{14.61,8.92,-20.78},{-12.08,0.65,-20.78},{-0.92,5.27,-20.78},{1.27,-0.62,-20.78},{-2.28,2.08,-20.78},{-10.07,4.64,-20.78},{5.35,3.42,-20.78},{13.35,3.37,-20.78},{2.53,-5.75,-20.78},
+		{2.39063,4.80322,-19.8245},{-10.2041,-0.48877,-20.3445},{4.65625,-2.125,-20.3445},{7.27734,11.5957,-20.8045},{-4.50854,5.10645,-19.8245},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}
+	};
+	lootPosSmall[] = {
+		{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}
+	};
 	zedPos[] = {{-0.924805,5.26563,-20.7845},{-12.0771,0.645508,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845}};
-	lootPosSmall[] = {{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}};
 };

 class Land_Panelak : Office
 {
-	lootPos[] = {{-2.76855,-6.26563,0.0714111},{-2.93848,-1.3916,0.0714111},{-5.4209,-3.13184,0.0814209},{-6.81152,-6.15527,0.0714111},{-4.00879,2.53027,0.0714111},{-0.730469,-3.20117,2.77145},{3.97852,-7.08936,2.77145},{2.49609,2.93701,2.77145},{6.78906,1.55273,2.77145},{6.38477,-2.3916,2.77145},{6.80566,-5.77295,2.77145},{4.59863,-1.36328,2.77145},{-0.824219,1.86914,1.32864}};
+	lootPos[] = {
+		//{-2.76855,-6.26563,0.0714111},{-2.93848,-1.3916,0.0714111},{-5.4209,-3.13184,0.0814209},{-6.81152,-6.15527,0.0714111},{-4.00879,2.53027,0.0714111},{-0.730469,-3.20117,2.77145},{3.97852,-7.08936,2.77145},{2.49609,2.93701,2.77145},{6.78906,1.55273,2.77145},{6.38477,-2.3916,2.77145},{6.80566,-5.77295,2.77145},{4.59863,-1.36328,2.77145},{-0.824219,1.86914,1.32864},
+		{-3.76709,-5.5791,0.0714226},{-6,-5.1709,0.0714226},{-4.86719,-3.30518,0.0714226},{-5.75098,1.51172,0.0714226},{3.95483,-4.83008,2.77144},{4.8728,1.51855,2.77144},{6.07324,-5.4668,2.77144}
+	};
+	lootPosSmall[] = {
+		{-4.05713,-4.55469,1.21142},{-4.03857,-4.71094,0.0714211},{-5.52002,-6.45508,0.0714211},{-3.9873,-3.06934,0.761421},{-3.99072,-3.84375,1.29142},{-4.09497,-2.15625,0.0714211},{-5.01172,1.91406,0.0714211},{-4.146,1.42871,0.391421},{1.37354,-5.00684,2.77144},{4.1167,-7.4834,2.77144},{4.2417,-3.69287,3.00144},{5.16602,-3.7334,3.40144},{4.15137,1.27051,2.77144},{4.66846,1.74414,3.43144},{5.69775,-6.44727,2.77144}
+	};
 	zedPos[] = {{-2.76855,-6.26563,0.0714111},{-2.93848,-1.3916,0.0714111},{-4.00879,2.53027,0.0714111},{-6.81152,-6.15527,0.0714111},{-5.4209,-3.13184,0.0814209},{-0.824219,1.86914,1.32864},{-0.730469,-3.20117,2.77145},{2.49609,2.93701,2.77145},{3.97852,-7.08936,2.77145},{4.59863,-1.36328,2.77145},{6.38477,-2.3916,2.77145},{6.78906,1.55273,2.77145},{6.80566,-5.77295,2.77145}};
-	lootPosSmall[] = {{-4.05713,-4.55469,1.21142},{-4.03857,-4.71094,0.0714211},{-5.52002,-6.45508,0.0714211},{-3.9873,-3.06934,0.761421},{-3.99072,-3.84375,1.29142},{-4.09497,-2.15625,0.0714211},{-5.01172,1.91406,0.0714211},{-4.146,1.42871,0.391421},{1.37354,-5.00684,2.77144},{4.1167,-7.4834,2.77144},{4.2417,-3.69287,3.00144},{5.16602,-3.7334,3.40144},{4.15137,1.27051,2.77144},{4.66846,1.74414,3.43144},{5.69775,-6.44727,2.77144}};
 };

 class Land_Panelak2 : Office
 {
-	lootPos[] = {{-0.729492,-3.00684,-2.62872},{-0.763672,1.36133,-1.3714},{-0.30127,3.64941,1.32861},{0.736328,-3.22266,2.76105},{-0.630859,1.84668,4.05231},{3.68896,-7.33789,5.46661},{2.26807,2.94043,5.46661},{6.70068,2.69043,5.46655},{6.87842,-1.45996,5.47675},{6.39795,-6.02734,5.47662},{4.55371,-1.76758,5.46667},{2.76416,0.446289,5.46661}};
+	lootPos[] = {
+		//{-0.729492,-3.00684,-2.62872},{-0.763672,1.36133,-1.3714},{-0.30127,3.64941,1.32861},{0.736328,-3.22266,2.76105},{-0.630859,1.84668,4.05231},{3.68896,-7.33789,5.46661},{2.26807,2.94043,5.46661},{6.70068,2.69043,5.46655},{6.87842,-1.45996,5.47675},{6.39795,-6.02734,5.47662},{4.55371,-1.76758,5.46667},{2.76416,0.446289,5.46661},
+		{0.53833,2.0498,-1.29137},{4.87939,1.90234,5.46665},{4.71045,-3.02197,5.46665},{6.01514,-5.86133,5.46665},{3.8833,-4.72314,5.46665}
+	};
+	lootPosSmall[] = {
+		{4.85205,-3.7041,6.69665},{4.38281,-3.68848,6.09665},{5.229,1.64063,6.24665},{4.62354,1.4082,6.24665},{5.41382,-5.54199,5.79665},{1.20215,-4.93652,5.47665}
+	};
 	zedPos[] = {{-0.729492,-3.00684,-2.62872},{-0.763672,1.36133,-1.3714},{-0.30127,3.64941,1.32861},{0.736328,-3.22266,2.76105},{-0.630859,1.84668,4.05231},{6.70068,2.69043,5.46655},{2.26807,2.94043,5.46661},{2.76416,0.446289,5.46661},{3.68896,-7.33789,5.46661},{4.55371,-1.76758,5.46667},{6.39795,-6.02734,5.47662},{6.87842,-1.45996,5.47675}};
-	lootPosSmall[] = {{4.85205,-3.7041,6.69665},{4.38281,-3.68848,6.09665},{5.229,1.64063,6.24665},{4.62354,1.4082,6.24665},{5.41382,-5.54199,5.79665},{1.20215,-4.93652,5.47665}};
 };

 class Land_rail_station_big : Office
 {
-	lootPos[] = {{-4.96924,4.56348,-4.99451},{0.461426,4.86621,-4.9848},{2.46631,2.22656,-4.97443},{-1.31689,-2.5918,-4.98444},{-3.29102,-0.121094,-4.98444},{-1.07373,2.37305,-4.98462},{7.46338,-3.40723,-5.04431},{8.93652,3.12695,-5.04443},{-8.16357,-5.12109,-5.03442}};
+	lootPos[] = {
+		//{-4.96924,4.56348,-4.99451},{0.461426,4.86621,-4.9848},{2.46631,2.22656,-4.97443},{-1.31689,-2.5918,-4.98444},{-3.29102,-0.121094,-4.98444},{-1.07373,2.37305,-4.98462},{7.46338,-3.40723,-5.04431},{8.93652,3.12695,-5.04443},{-8.16357,-5.12109,-5.03442},
+		{2.11914,-0.13208,-4.98439},{0.712402,0.718994,-4.98439},{2.45654,3.80566,-4.98439},{7.45947,1.49683,-5.04438}
+	};
+	lootPosSmall[] = {
+		{1.81641,0.77417,-4.05439},{2.74609,0.869385,-4.05438},{-5.16943,-3.43555,-4.98439},{9.25,0.421631,-5.04438},{-6.54004,-4.09692,-5.04439}
+	};
 	zedPos[] = {{8.93652,3.12695,-5.04443},{7.46338,-3.40723,-5.04431},{-8.16357,-5.12109,-5.03442},{-4.96924,4.56348,-4.99451},{0.461426,4.86621,-4.9848},{-1.07373,2.37305,-4.98462},{-1.31689,-2.5918,-4.98444},{-3.29102,-0.121094,-4.98444},{2.46631,2.22656,-4.97443}};
-	lootPosSmall[] = {{1.81641,0.77417,-4.05439},{2.74609,0.869385,-4.05438},{-5.16943,-3.43555,-4.98439},{9.25,0.421631,-5.04438},{-6.54004,-4.09692,-5.04439}};
 };

 class Land_A_Office01 : Office
 {
-	lootPos[] = {{-2.50391,-2.46875,-4.52798},{4.11279,-0.686523,-4.52798},{4.11133,6.11328,-4.52798},{0.242188,6.06348,-4.52798},{4.31641,3.74121,-4.52798},{5.08887,0.219727,-4.52798},{11.8037,-1.77832,-4.52798},{14.5811,-4.1123,-4.52798},{13.8174,-0.731445,-4.52798},{-7.76221,5.59082,-4.52798},{1.81152,0.994141,-2.02802},{4.93164,4.32031,-2.02802},{1.18945,6.07129,-2.02802},{2.23145,3.76563,-2.02802},{-4.89111,-2.54785,-1.99799},{-14.5596,-3.40625,-1.98798},{-15.2705,5.92871,-1.94794},{-10.9063,6.04199,0.451996},{-6.30762,3.30078,0.482025},{7.6416,6.3877,0.472015},{13.6729,6.59668,0.451965},{13.1924,-2.58594,0.492004},{3.09229,2.4375,6.2049},{-1.45654,-2.2832,6.19489},{-2.12988,4.5166,0.472015},{4.7666,-4.55859,-2.02487},{8.3457,-1.10645,-2.02802},{9.94727,-3.74023,-2.008},{7.13867,-2.50684,-2.02802},{12.8701,4.70996,-2.02802},{15.3721,3.42383,-2.02802}};
+	lootPos[] = {
+		//{-2.5,-2.47,-4.53},{4.11,-0.69,-4.53},{4.11,6.11,-4.53},{0.24,6.06,-4.53},{4.32,3.74,-4.53},{5.09,0.22,-4.53},{11.8,-1.78,-4.53},{14.58,-4.11,-4.53},{13.82,-0.73,-4.53},{-7.76,5.59,-4.53},{1.81,1,-2.03},{4.93,4.32,-2.03},{0.52,6.76,-2.03},{2.23,3.76,-2.03},{-4.89,-2.55,-2},{-14.56,-3.41,-1.99},{-15.27,5.93,-1.95},{-10.91,6.04,0.45},{-6.31,3.3,0.48},{7.64,6.39,0.47},{13.67,6.6,0.45},{13.19,-2.59,0.49},{3.09,2.44,6.2},{-1.46,-2.28,6.19},{-2.29,4.54,0.47},{4.77,-4.56,-2.02},{8.35,-1.11,-2.03},{9.95,-3.74,-2.01},{7.14,-2.51,-2.03},{12.87,4.71,-2.03},{15.37,3.42,-2.03},{-0.74,3.17,-4.53},{15.57,1.33,-2.03},{-0.07,-6.44,-2},{-7.93,3.18,-2.03},{-6.05,6.27,-2.03},{-13.11,1.06,-2.03},{-3.3,4.18,6.2},
+		{-7.84912,6.3855,-4.528},{3.84424,3.27051,-4.528},{-0.0383301,3.51733,-4.528},{5.37695,5.63379,-4.528},{15.5393,-1.90015,-4.528},{13.8057,-2.3811,-4.528},{10.114,3.44849,-4.528},{10.3008,6.32495,-4.528},{1.71021,1.66675,-4.528},{1.58032,5.87671,-2.028},{-0.599854,7.08984,-2.028},{3.87769,6.84229,-2.028},{-7.6709,6.72485,-2.038},{-4.729,4.19556,-2.028},{-7.93091,3.2041,-2.038},{10.2354,-1.9187,-2.018},{6.9812,-4.30933,-2.038},{15.4075,6.03198,-2.038},{13.9285,3.40649,-2.038},{0.163086,3.43286,0.472002},{7.13892,3.64844,0.471998},{1.71973,-1.40967,6.72491},{-0.443359,0.61499,-2.028},{-5.22144,-3.69971,-2.028}
+	};
+	lootPosSmall[] = {
+		{3.50342,5.28027,-3.668},{5.68286,4.95898,-4.048},{0.895508,4.98511,-3.288},{2.42017,4.98291,-2.908},{15.8838,-2.62256,-2.908},{4.74072,6.75391,-0.938002},{7.69507,-0.465332,-1.618},{10.7341,-1.90918,-1.158},{6.34229,-2.73242,-0.398003},{-4.86572,7.16187,-0.988003},{-4.27173,4.2207,-0.778002},{-4.56543,5.48193,-1.348},{-8.21387,2.04932,-2.028},{12.6631,2.83398,-1.918},{12.8892,2.82178,-0.778002},{11.5281,7.08887,-1.338},{11.3428,5.02344,-1.158},{11.636,6.34937,-1.338},{-3.802,4.13525,1.71201},{0.720947,3.55957,0.952003},{-3.78076,4.44727,0.952003},{10.7363,3.28833,-3.668},{6.46191,5.13013,-2.908},{7.03906,6.25537,-4.098},{6.68823,5.81177,-3.818},{10.7056,4.13135,-3.288},{2.86792,-0.489014,6.72491}
+	};
 	zedPos[] = {{0.242188,6.06348,-4.52798},{11.8037,-1.77832,-4.52798},{13.8174,-0.731445,-4.52798},{14.5811,-4.1123,-4.52798},{-2.50391,-2.46875,-4.52798},{4.11133,6.11328,-4.52798},{4.11279,-0.686523,-4.52798},{4.31641,3.74121,-4.52798},{5.08887,0.219727,-4.52798},{-7.76221,5.59082,-4.52798},{1.18945,6.07129,-2.02802},{12.8701,4.70996,-2.02802},{15.3721,3.42383,-2.02802},{1.81152,0.994141,-2.02802},{2.23145,3.76563,-2.02802},{4.93164,4.32031,-2.02802},{7.13867,-2.50684,-2.02802},{8.3457,-1.10645,-2.02802},{4.7666,-4.55859,-2.02487},{9.94727,-3.74023,-2.008},{-4.89111,-2.54785,-1.99799},{-14.5596,-3.40625,-1.98798},{-15.2705,5.92871,-1.94794},{13.6729,6.59668,0.451965},{-10.9063,6.04199,0.451996},{-2.12988,4.5166,0.472015},{7.6416,6.3877,0.472015},{-6.30762,3.30078,0.482025},{13.1924,-2.58594,0.492004},{-1.45654,-2.2832,6.19489},{3.09229,2.4375,6.2049}};
-	lootPosSmall[] = {{3.50342,5.28027,-3.668},{5.68286,4.95898,-4.048},{0.895508,4.98511,-3.288},{2.42017,4.98291,-2.908},{15.8838,-2.62256,-2.908},{4.74072,6.75391,-0.938002},{7.69507,-0.465332,-1.618},{10.7341,-1.90918,-1.158},{6.34229,-2.73242,-0.398003},{-4.86572,7.16187,-0.988003},{-4.27173,4.2207,-0.778002},{-4.56543,5.48193,-1.348},{-8.21387,2.04932,-2.028},{12.6631,2.83398,-1.918},{12.8892,2.82178,-0.778002},{11.5281,7.08887,-1.338},{11.3428,5.02344,-1.158},{11.636,6.34937,-1.338},{-3.802,4.13525,1.71201},{0.720947,3.55957,0.952003},{-3.78076,4.44727,0.952003},{10.7363,3.28833,-3.668},{6.46191,5.13013,-2.908},{7.03906,6.25537,-4.098},{6.68823,5.81177,-3.818},{10.7056,4.13135,-3.288},{2.86792,-0.489014,6.72491}};
 };

 class Land_A_Office02 : Office
 {
-	lootPos[] = {{19.8076,3.26123,5.38394},{0.27002,0.0458984,5.38394},{5.0415,-4.854,-8.17109},{-0.263184,-5.15259,-8.17105}};
+	lootPos[] = {
+		//{4.72266,-5.74219,-8.15109},{0.961426,-5.16992,-8.15076},
+		{19.8076,3.26123,5.38394},{0.27002,0.0458984,5.38394},{5.0415,-4.854,-8.17109},{-0.263184,-5.15259,-8.17105}
+	};
+	lootPosSmall[] = {
+		{-0.112305,-4.35254,-8.17073},{-0.813965,-4.14355,-7.79043},{4.104,-7.27051,-8.1711},{10.7427,2.16992,5.38394},{21.5991,2.56104,5.42394},{-4.02783,2.4668,5.38394},{-17.3232,1.29028,8.71684},{-18.0732,3.38623,8.71684}
+	};
 	zedPos[] = {{4.72266,-5.74219,-8.15109},{0.961426,-5.16992,-8.15076}};
-	lootPosSmall[] = {{-0.112305,-4.35254,-8.17073},{-0.813965,-4.14355,-7.79043},{4.104,-7.27051,-8.1711},{10.7427,2.16992,5.38394},{21.5991,2.56104,5.42394},{-4.02783,2.4668,5.38394},{-17.3232,1.29028,8.71684},{-18.0732,3.38623,8.71684}};
 };
+// ALT-MAP Support 
+class Land_aif_hotel : Office //multi-story hotel with balconies
+{
+	lootPos[] = {{14.0938,-4.38281,6.24485},{4.53711,12.8853,6.24484},{-20.623,-7.3584,2.74056},{-20.9375,-15.0547,-0.759435},{-20.4102,-4.95166,-4.25943},{20.8555,6.60156,-4.25943}};
+};
+class Land_aif_hotel_bio : Office // multi-story hotel with balconies
+{
+	zedPos[] = {{-18.5781,4.20801,-8.5215},{-17.8848,-6.33398,-8.52153}};
+	lootPos[] = {{-17.8848,-6.33398,-8.52153},{16.8477,-12.5811,-8.52153},{17.8984,12.9102,-8.52153},{-1.51172,11.0117,-8.52153},{-23.4453,-5.7998,-0.835522},
+	{-22.4063,-16.8887,3.01448},{-5.8418,5.27832,6.86919},{16.7227,16.8076,6.86919},{18.2676,-14.2627,6.86919},{-16.8984,-16.3701,6.86919}};
+};
+// ALT-MAP Support 
+
 //DZE BELOW
 class LAND_ibr_bank: Office
 {
@@ -96,8 +139,10 @@ class Land_ibr_terminal: Office
 		{ -2.83545,10.9009,-0.949741 },
 		{ -2.27686,-16.4238,3.68157 }};
 };
-class Land_A_Villa_EP1: Office
+class Land_A_Villa_EP1: Office // takistani villa 2 story multi-wing 
 {
+	zedPos[] = {{5.5332,2.70361,-5.06721},{13.2578,-14.3623,-5.06719}};
+	//lootPos[] = {{-15.002,9.06104,1.97169},{10.3047,10.7178,1.97146},{17.4824,-15.3862,1.99229},{10.1855,-0.722656,-1.4844},{-2.54688,14.5698,-1.4844},{-14.8945,12.7236,-1.4844},{-8.51953,14.1064,-1.4844}};
 	lootPos[] = {
 		{ -23.3442,1.71484,-3.65929 },
 		{ 14.5498,-5.69775,-5.06722 },
@@ -178,13 +223,25 @@ class Land_MBG_Police_Station: Office
 		{ -2.3125,6.18774,1.68834 }};
 };

-class land_mbg_apartments_big_04: Office {
-	lootPos[] = {{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}};
+class land_mbg_apartments_big_04: Office { // multi-story cement, 3 non-enterable garages
+	//lootPos[] = {{-3.8877,1.5293,-3.19898},{4.02832,0.519531,-3.19898},{3.97266,1.04883,-0.15098},{-3.33691,1.17188,-0.15098},{3.7002,0.867188,2.89702},{-3.55762,0.628906,2.89702},{-6.69922,2.30859,5.94502},{8.12402,-1.16211,5.94502}};
+	lootPos[] = {
+		{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}
+	};
+	lootPosSmall[] = {
+		{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}
+	};
+	//zedPos[] = {{0.592773,-0.105469,-7.46618},{0.290039,1.49023,-7.43577}};
 	zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
-	lootPosSmall[] = {{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}};
 };
-class land_mbg_ger_estate_2: Office {
-	lootPos[] = {{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}};
+class land_mbg_ger_estate_2: Office { // 2 stucco red/orange light by door
+	//lootPos[]={{5.34766,-0.882813,-2.13187},{2.38281,-1.03418,-2.13187},{2.54688,-4.41602,-2.13187},{-7.71094,-2.73242,-2.13187},{-2.22656,5.91602,-2.13187},{-5.36328,4.46387,-2.13187}};
+	lootPos[] = {
+		{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}
+	};
+	lootPosSmall[] = {
+		{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}
+	};
+	//zedPos[] = {{2.38281,-1.03418,-2.13187}};
 	zedPos[] = {{2.12695,-8.60791,-1.5208},{1.33984,9.18945,-1.25071}};
-	lootPosSmall[] = {{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}};
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Residential.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Residential.hpp
@@ -1,4 +1,3 @@
-//lootPosSmall is for mainly for more loot spawns, it uses the regular loot table
 class Residential : Default
 {
 	zombieChance = 0.3;
@@ -19,65 +18,94 @@ class Residential : Default
 class Land_HouseV_1I4 : Residential
 {
 	zedPos[] = {{-0.400146,-3.87891,-2.7688},{-3.67651,-2.51758,-2.76544},{-0.472412,3.19824,-2.72028}};
-	lootPos[] = {{-0.400146,-3.87891,-2.7688},{-3.67651,-2.51758,-2.76544},{-0.472412,3.19824,-2.72028}};
-	lootPosSmall[] = {{-1.91772,-5.13812,-2.14811},{-4.34497,-1.12036,-1.88536},{-2.12329,-2.59363,-2.05582},{-1.34595,-2.80969,-2.04825}};
+	lootPos[] = {
+		//{0.53,-4.53,-2.77},{-3.83,-2.5,-2.77},{-0.51,3.92,-2.72},{-1.93,-5.12,-2.17},{0.57,-1.53,-2.76},
+		{0.222168,3.90839,-2.73031},{-1.82983,-1.81403,-2.76768}
+	};
+	lootPosSmall[] = {
+		{-1.91772,-5.13812,-2.14811},{-4.34497,-1.12036,-1.88536},{-2.12329,-2.59363,-2.05582},{-1.34595,-2.80969,-2.04825}
+	};
 };

 class Land_kulna : Residential
 {
 	zedPos[] = {{-0.498291,1.92871,-1.12811},{0.503174,0.217773,-1.11633}};
-	lootPos[] = {{0.503174,0.217773,-1.11633},{-0.498291,1.92871,-1.12811}};
+	//lootPos[] = {{0.503174,0.217773,-1.11633},{-0.498291,1.92871,-1.12811}};
+	lootPos[] = {{0.213379,1.49707,-1.14344}};
 };

 class Land_hut06 : Residential
 {
 	zedPos[] = {{0.337402,2.27051,-1.56116},{-0.637695,0.753906,-1.53836}};
-	lootPos[] = {{0.337402,2.27051,-1.56116},{-0.637695,0.753906,-1.53836}};
+	//lootPos[] = {{0.337402,2.27051,-1.56116},{-0.637695,0.753906,-1.53836}};
+	lootPos[] = {{0.328125,2.26953,-1.57786},{-0.552368,-0.0620117,-1.53837}};
 };

 class land_r_housev2_04: Residential { //DZE ADDED
-	lootPos[] = {{0.364502,3.06128,-4.08876},{-4.49097,3.29565,-4.0887},{7.0625,-1.54053,-4.09079}};
+	lootPos[] = {
+		{0.364502,3.06128,-4.08876},{-4.49097,3.29565,-4.0887},{7.0625,-1.54053,-4.09079}
+	};
+	lootPosSmall[] = {
+		{-5.88696,2.77051,-4.08894},{-4.32666,6.00415,-4.0887},{7.37158,4.41968,-4.08918},{6.17065,2.39063,-4.09028}
+	};
 	zedPos[] = {{-1.72021,2.7146,-3.20429},{2.7522,2.9668,-3.20421},{4.73706,-0.942627,-3.20546}};
-	lootPosSmall[] = {{-5.88696,2.77051,-4.08894},{-4.32666,6.00415,-4.0887},{7.37158,4.41968,-4.08918},{6.17065,2.39063,-4.09028}};
 };

 class Land_Hlidac_budka : Residential
 {
 	zedPos[] = {{2.02051,0.444336,-0.81366},{-0.460938,1.75879,-0.78363},{-2.31836,1.5127,-0.78363}};
-	lootPos[] = {{-2.31836,1.5127,-0.78363},{2.02051,0.444336,-0.81366},{-0.460938,1.75879,-0.78363}};
-	lootPosSmall[] = {{0.987305,2.43359,-0.113617},{1.67773,2.24927,-0.113617},{-0.138184,0.0844727,-0.713617}};
+	lootPos[] = {
+		//{-2.31836,1.5127,-0.78363},{2.02051,0.444336,-0.81366},{-0.460938,1.75879,-0.78363},
+		{2.4209,2.16064,-0.783617}
+	};
+	lootPosSmall[] = {
+		{0.987305,2.43359,-0.113617},{1.67773,2.24927,-0.113617},{-0.138184,0.0844727,-0.713617}
+	};
 };

 class Land_HouseV2_02_Interier : Residential
 {
 	zedPos[] = {{-3.62598,3.05273,-5.58072},{3.34814,1.9707,-5.57071},{5.20117,-1.54004,-5.57071},{-5.71094,5.49414,-5.57071},{7.23145,5.37109,-5.57071},{-7.57861,-1.01563,-5.57071},{8.5498,0.754883,-5.57071},{-6.52295,2.35547,-5.5607}};
-	lootPos[] = {{7.23,5.37,-5.57},{8.55,0.75,-5.57},{5.2,-1.54,-5.57},{3.35,1.97,-5.57},{-3.63,3.05,-5.58},{-7.58,-1.02,-5.57},{-6.52,2.35,-5.56},{-5.71,5.49,-5.57},{6.53,1.49,-4.64},{0.05,1.32,-5.53}};
+	lootPos[] = {
+		//{7.23,5.37,-5.57},{8.55,0.75,-5.57},{5.2,-1.54,-5.57},{3.35,1.97,-5.57},{-3.63,3.05,-5.58},{-7.58,-1.02,-5.57},{-6.52,2.35,-5.56},{-5.71,5.49,-5.57},{6.53,1.49,-4.64},{0.05,1.32,-5.53},
+		{6.97412,1.26904,-5.53068},{4.21631,6.56396,-5.53068},{-5.94922,-1.28955,-5.53068},{-3.31494,6.44287,-5.53068}
+	};
+	lootPosSmall[] = {
+		{6.44629,1.7251,-4.61068},{6.63672,1.2583,-4.61068},{8.7749,-2.23779,-4.74068},{2.81006,6.30908,-5.57068},{-4.97754,-2.1543,-5.57068},{-2.42676,5.58887,-5.57068}
+	};
 };

 class Land_A_Pub_01 : Residential
 {
 	zombieChance = 0.2;
-	lootPos[] = {{1.83,0.39,-5.75},{-1.77,0.33,-5.76},{-6.66,-6.43,-5.76},{-4.64,-0.1,-5.75},{-5.76,-3.05,-5.75},{-2.08,0.92,-1.79},{-4.77,-5.89,-1.78},{-6.94,-1.94,-1.77},{-4.05,-0.78,-1.78},{1.4,-1.74,-1.76},{3.14,-2.79,-1.76},{3.58,-0.59,-1.76},{3.03,-4.04,-1.76},{1.94,3.19,-1.78},{-0.1,6.22,-1.78},{5.3,7.56,-1.79},{6.93,-2.85,-1.79},{2.57,-4.6,-5.76},{4.07,5.41,-5.76},{0.75,2.3,-5.75},{6.47,-1.71,-5.06}};
+	lootPos[] = {
+		//{1.83,0.39,-5.75},{-1.77,0.33,-5.76},{-6.66,-6.43,-5.76},{-4.64,-0.1,-5.75},{-5.76,-3.05,-5.75},{-2.08,0.92,-1.79},{-4.77,-5.89,-1.78},{-6.94,-1.94,-1.77},{-4.05,-0.78,-1.78},{1.4,-1.74,-1.76},{3.14,-2.79,-1.76},{3.58,-0.59,-1.76},{3.03,-4.04,-1.76},{1.94,3.19,-1.78},{-0.1,6.22,-1.78},{5.3,7.56,-1.79},{6.93,-2.85,-1.79},{2.57,-4.6,-5.76},{4.07,5.41,-5.76},{0.75,2.3,-5.75},{6.47,-1.71,-5.06},
+		{1.17188,5.7522,-5.75623},{6.46191,-1.73706,-5.01623},{6.46777,1.47949,-5.75623},{0.975098,-5.80859,-5.75621},{-5.79736,-2.57813,-1.79123},{-7.35303,-3.7627,-1.79123},{4.56885,0.998291,-1.79123},{3.45947,0.236328,-1.79123},{1.91504,6.302,-1.79123},{0.114258,2.17432,-1.79123},{6.52832,6.10889,-1.79123},{0.555176,0.169189,-1.79123},{-4.37793,-2.64038,-5.75623},{-7.1709,-1.76855,-5.75623}
+	};
+	lootPosSmall[] = {
+		{-0.602051,2.69214,-5.48623},{2.0708,1.98486,-5.19622},{1.37744,7.89722,-5.01622},{3.28076,-1.51782,-4.75623},{2.79395,-1.90845,-4.75622},{1.19043,-1.97632,-4.7562},{4.03418,-5.81592,-5.30621},{1.46143,-6.27979,-5.01621},{-4.8252,-2.66309,-1.78122},{1.16504,1.125,-1.19122},{2.73486,0.744873,-0.701225},{5.04053,-2.60938,-1.78122},{5.00293,2.03491,-1.78122},{2.89844,5.78613,-1.37122},{1.44482,6.51831,-1.31123},{1.77734,7.88013,-1.79123},{5.81934,5.90967,-1.41122},{-3.41016,1.26123,-1.78123},{-7.37891,-1.24756,-5.28622}
+	};
 	zedPos[] = {{-1.76563,0.334473,-5.75623},{2.56934,-4.6001,-5.75623},{4.06738,5.41406,-5.75623},{-6.66211,-6.4292,-5.75623},{0.75293,2.2998,-5.74622},{-4.63574,-0.100586,-5.74622},{-5.75977,-3.05029,-5.74622},{1.83398,0.394043,-5.74619},{-2.08203,0.922852,-1.79126},{5.30469,7.55957,-1.79126},{6.93164,-2.84668,-1.79126},{-0.0957031,6.22461,-1.78125},{1.94141,3.18799,-1.78125},{-4.05273,-0.779785,-1.78125},{-4.76563,-5.89111,-1.78125},{-6.94434,-1.9375,-1.77124},{1.39844,-1.73779,-1.76123},{3.03027,-4.04346,-1.76123},{3.13867,-2.78564,-1.76123},{3.58301,-0.591309,-1.76123}};
-	lootPosSmall[] = {{-0.602051,2.69214,-5.48623},{2.0708,1.98486,-5.19622},{1.37744,7.89722,-5.01622},{3.28076,-1.51782,-4.75623},{2.79395,-1.90845,-4.75622},{1.19043,-1.97632,-4.7562},{4.03418,-5.81592,-5.30621},{1.46143,-6.27979,-5.01621},{-4.8252,-2.66309,-1.78122},{1.16504,1.125,-1.19122},{2.73486,0.744873,-0.701225},{5.04053,-2.60938,-1.78122},{5.00293,2.03491,-1.78122},{2.89844,5.78613,-1.37122},{1.44482,6.51831,-1.31123},{1.77734,7.88013,-1.79123},{5.81934,5.90967,-1.41122},{-3.41016,1.26123,-1.78123},{-7.37891,-1.24756,-5.28622}};
 };

 class Land_Shed_wooden : Residential
 {
 	zedPos[] = {{-0.342773,1.0293,-1.29156},{1.26807,-0.362305,-1.29156}};
-	lootPos[] = {{1.26807,-0.362305,-1.29156},{-0.342773,1.0293,-1.29156}};
+	//lootPos[] = {{1.26807,-0.362305,-1.29156},{-0.342773,1.0293,-1.29156}};
+	lootPos[] = {{1.26807,-0.361328,-1.29153},{-0.342773,1.0293,-1.29153}};
 };

 class Land_HouseBlock_A1_1 : Residential
 {
 	zedPos[] = {{-3.52881,0.15918,-4.74365},{-3.56152,-2.33496,-4.73096}};
-	lootPos[] = {{-3.52881,0.15918,-4.74365},{-3.56152,-2.33496,-4.73096}};
+	//lootPos[] = {{-3.52881,0.15918,-4.74365},{-3.56152,-2.33496,-4.73096}};
+	lootPos[] = {{-3.52881,0.158936,-4.74365},{-3.56152,-2.33484,-4.73106}};
 };

 class Land_HouseV_1I1 : Residential
 {
 	zedPos[] = {{0.100586,-2.34473,-2.88281}};
-	lootPos[] = {{0.100586,-2.34473,-2.88281}};
+	//lootPos[] = {{0.100586,-2.34473,-2.88281}};
 	lootPosSmall[] = {{0.728516,-2.01514,-2.86235}};
 };

@@ -86,21 +114,31 @@ class Land_A_MunicipalOffice : Residential
 	maxRoaming = 3;
 	zedPos[] = {{-0.20752,-6.48633,-18.429},{3.31641,-5.77441,-18.429},{-4.66113,-6.27246,-18.429}};
 	lootChance = 0.4;
-	lootPos[] = {{-4.66113,-6.27246,-18.429},{3.31641,-5.77441,-18.429},{-0.20752,-6.48633,-18.429},{-9.72412,-4.8877,-3.759},{-9.57813,3.55566,-3.759},{-7.17285,11.083,-3.76901},{5.06934,11.1836,-3.74899},{9.3208,5.38574,-3.76901},{9.65283,-4.82129,-3.74899},{3.23535,-0.106445,-0.169037},{4.85156,-3.69043,-0.169037},{-0.80127,-7.88184,-0.169037},{-4.4082,-4.91797,-0.169037},{-4.90771,-2.23145,-0.169037}};
-	lootPosSmall[] = {{4.34521,-8.81567,-18.439},{-1.06787,-5.11499,-18.439},{1.3291,9.86938,-18.4413},{-1.54395,9.90649,-18.4353}};
+	lootPos[] = {
+		//{-4.66113,-6.27246,-18.429},{3.31641,-5.77441,-18.429},{-0.20752,-6.48633,-18.429},{-9.72412,-4.8877,-3.759},{-9.57813,3.55566,-3.759},{-7.17285,11.083,-3.76901},{5.06934,11.1836,-3.74899},{9.3208,5.38574,-3.76901},{9.65283,-4.82129,-3.74899},{3.23535,-0.106445,-0.169037},{4.85156,-3.69043,-0.169037},{-0.80127,-7.88184,-0.169037},{-4.4082,-4.91797,-0.169037},{-4.90771,-2.23145,-0.169037},
+		{-4.66113,-6.27173,-18.429},{3.31641,-5.77417,-18.429},{-0.20752,-6.48682,-18.429},{-9.72412,-4.88745,-3.78903},{-9.57813,3.55615,-3.78903},{-7.16797,11.0737,-3.78903},{5.07422,11.1838,-3.78903},{9.3208,5.38623,-3.78903},{9.65332,-4.82056,-3.78903},{3.23535,-0.105957,-0.169027},{4.85205,-3.69019,-0.169027},{-0.80127,-7.89087,-0.169027},{-4.4082,-4.91772,-0.169027},{-4.90771,-2.23169,-0.169027}
+	};
+	lootPosSmall[] = {
+		{4.34521,-8.81567,-18.439},{-1.06787,-5.11499,-18.439},{1.3291,9.86938,-18.4413},{-1.54395,9.90649,-18.4353}
+	};
 };

 class Land_HouseV2_04_interier : Residential
 {
 	zedPos[] = {{2.10938,6.60449,-5.76862},{-2.30029,4.22461,-5.75937},{-4.96289,2.91309,-5.74985},{1.95557,4.16211,-5.74939},{-5.13281,6.74316,-5.74857},{7.51025,-0.931641,-5.74176},{7.49561,5.83594,-5.73901}};
-	lootPos[] = {{7.5,6.93,-5.74},{7.58,-1.89,-5.74},{1.85,2.66,-5.06},{3.38,6.4,-5.77},{-1.44,3.1,-5.76},{-3.63,6.88,-4.99},{-4.96,2.91,-5.75},{0.29,1.26,-2.93},{-1.44,6.44,-5.74},{4.82,2.63,-5.74}};
-	lootPosSmall[] = {{4.7594,2.8042,-5.07979},{4.93396,2.56348,-5.07979},{1.95215,2.67529,-5.05956},{0.668823,2.56299,-5.74944},{-3.7146,7.07813,-4.98862},{-3.31897,6.68457,-4.98895},{-2.87244,6.92676,-5.29893},{-3.95215,2.85449,-5.19935}};
+	lootPos[] = {
+		//{7.5,6.93,-5.74},{7.58,-1.89,-5.74},{1.85,2.66,-5.06},{3.38,6.4,-5.77},{-1.44,3.1,-5.76},{-3.63,6.88,-4.99},{-4.96,2.91,-5.75},{0.29,1.26,-2.93},{-1.44,6.44,-5.74},{4.82,2.63,-5.74},
+		{-5.08826,3.13818,-5.73971},{7.37061,6.52881,-5.73873},{1.75281,3.70752,-5.73953},{-3.75183,7.1626,-5.73842},{0.292725,1.27441,-2.93809}
+	};
+	lootPosSmall[] = {
+		{4.7594,2.8042,-5.07979},{4.93396,2.56348,-5.07979},{1.95215,2.67529,-5.05956},{0.668823,2.56299,-5.74944},{-3.7146,7.07813,-4.98862},{-3.31897,6.68457,-4.98895},{-2.87244,6.92676,-5.29893},{-3.95215,2.85449,-5.19935}
+	};
 };

 class Land_HouseV2_01A : Residential
 {
 	zedPos[] = {{-1.60547,-3.23535,-5.61884},{-3.37256,-3.34082,-5.58344}};
-	lootPos[] = {{-3.37256,-3.34082,-5.58344},{-1.60547,-3.23535,-5.61884}};
+	//lootPos[] = {{-3.37256,-3.34082,-5.58344},{-1.60547,-3.23535,-5.61884}};
 	lootPosSmall[] = {{-3.53906,-3.29736,-5.55779},{-0.759766,-3.95068,-5.56563}};
 };

@@ -117,15 +155,21 @@ class Land_KBud : Residential
 	zombieChance = 0.3;
 	maxRoaming = 0;
 	zedPos[] = {{-0.017334,0.0107422,-0.663696}};
-	lootPos[] = {{-0.017334,0.0107422,-0.663696}};
+	//lootPos[] = {{-0.017334,0.0107422,-0.663696}};
+	lootPos[] = {{-0.0170898,0.0114746,-0.66367}};
 };

 class Land_sara_domek_zluty : Residential
 {
 	maxRoaming = 1;
 	zedPos[] = {{-6.17139,-2.33789,-2.43384},{-0.660645,2.05469,-2.43372},{6.36401,-0.236328,-2.43372},{2.95679,3.00684,-2.43365},{-3.75342,-3.54785,-2.42389},{-2.77441,0.751953,-2.42371},{-5.07666,3.04395,-2.42352},{0.627197,-0.584961,-2.41394},{7.06665,2.9541,-2.4137}};
-	lootPos[] = {{2.96,3.01,-2.43},{7.07,2.95,-2.41},{6.36,-0.24,-2.43},{0.63,-0.58,-2.44},{-0.66,2.05,-2.43},{-2.77,0.75,-2.42},{-5.08,3.04,-2.42},{-6.17,-2.34,-2.43},{-3.75,-3.55,-2.42}};
-	lootPosSmall[] = {{7.26685,-0.882324,-2.43378},{4.00684,3.84766,-2.43372},{-1.11255,1.29395,-2.43382},{-7.22192,-4.23584,-2.43386}};
+	lootPos[] = {
+		//{2.96,3.01,-2.43},{7.07,2.95,-2.41},{6.36,-0.24,-2.43},{0.63,-0.58,-2.44},{-0.66,2.05,-2.43},{-2.77,0.75,-2.42},{-5.08,3.04,-2.42},{-6.17,-2.34,-2.43},{-3.75,-3.55,-2.42},
+		{6.91724,3.09277,-2.43372},{6.52881,-0.521973,-2.43379},{0.613037,3.74463,-2.4337},{-7.00024,-0.744141,-2.43373},{-3.13672,3.45459,-2.43364},{-6.81055,-2.67676,-2.43385}
+	};
+	lootPosSmall[] = {
+		{7.26685,-0.882324,-2.43378},{4.00684,3.84766,-2.43372},{-1.11255,1.29395,-2.43382},{-7.22192,-4.23584,-2.43386}
+	};
 };

 class Land_HouseV_3I4 : Residential
@@ -153,8 +197,13 @@ class Land_HouseV_1L2 : Residential
 {
 	maxRoaming = 3;
 	zedPos[] = {{-0.448242,5.29883,-3.01697}};
-	lootPos[] = {{-0.448242,5.29883,-3.01697}};
-	lootPosSmall[] = {{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{4.29126,-1.02441,0.0606384},{-0.199707,3.28711,-2.9292}};
+	lootPos[] = {
+		//{-0.448242,5.29883,-3.01697}
+		{-2.58887,-4.8584,-0.789368},{-2.58887,-4.8584,-0.789368},{-2.37646,0.373047,-0.799377}
+	};
+	lootPosSmall[] = {
+		{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{4.29126,-1.02441,0.0606384},{-0.199707,3.28711,-2.9292}
+	};
 };

 class Land_HouseV_1T : Residential
@@ -179,7 +228,8 @@ class Land_HouseV_1I2 : Residential
 class Land_HouseV_2L : Residential
 {
 	zedPos[] = {{-3.98438,-3.87207,-4.02338},{4.32617,1.81836,-3.96332}};
-	lootPos[] = {{4.32617,1.81836,-3.96332},{-3.98438,-3.87207,-4.02338}};
+	//lootPos[] = {{4.32617,1.81836,-3.96332},{-3.98438,-3.87207,-4.02338}};
+	lootPosSmall[] = {{4.39404,1.28296,-3.96535},{4.12988,2.52222,-3.95569}};
 };

 class Land_HouseV_1I3 : Residential
@@ -191,7 +241,14 @@ class Land_HouseV_1I3 : Residential
 class Land_houseV_2T2 : Residential
 {
 	zedPos[] = {{-4.24951,0.988281,-4.0574}};
-	lootPos[] = {{-4.24951,0.988281,-4.0574}};
+	lootPos[] = {
+		//{-4.24951,0.988281,-4.0574},
+		{-3.49072,1.01782,-4.03519}
+	};
+	lootPosSmall[] = {
+		{2.8606,4.33081,-4.65974},
+		{-0.222778,4.34985,-4.65713}
+	};
 };

 class Land_HouseBlock_A1 : Residential
@@ -209,14 +266,13 @@ class Land_HouseBlock_A2_1 : Residential
 class Land_HouseBlock_A3 : Residential
 {
 	zedPos[] = {{0.554688,2.70801,-5.4317}};
-	lootPos[] = {{0.554688,2.70801,-5.4317}};
+	lootPos[] = {{0.56,2.71,-5.43},{-0.72,-3.61,-5.45},{1.04,-1.56,-5.45}};
 };

 class Land_HouseBlock_B5 : Residential
 {
 	zedPos[] = {{-5.10742,5.23926,-7.57431}};
 	lootPos[] = {{-5.10742,5.23926,-7.57431}};
-	lootPosSmall[] = {{-0.0693359,4.82227,-7.28133}};
 };

 class Land_HouseBlock_B6 : Residential
@@ -234,7 +290,7 @@ class Land_HouseBlock_C1 : Residential
 class Land_HouseV2_01B : Residential
 {
 	zedPos[] = {{9.53711,3.39453,-6.11053}};
-	lootPos[] = {{9.53711,3.39453,-6.11053}};
+	//lootPos[] = {{9.53711,3.39453,-6.11053}};
 	lootPosSmall[] = {{-4.27881,-2.22852,-5.18173}};
 };

@@ -249,7 +305,6 @@ class Land_Mil_Guardhouse : Residential //MOVED TO MIL
 	maxRoaming = 3;
 	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
 	lootPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
-	lootPosSmall[] = {{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}};
 };
 */
 class LADAWreck : Residential
@@ -293,17 +348,47 @@ class Land_NAV_Lighthouse : Residential
 class Land_Panelak3 : Residential
 {
 	zedPos[] = {};
-	lootPos[]={{0.54,-0.71,-8.11},{2.51,-1.84,12.38},{2.8,-0.67,12.38},{3.98,-1.49,12.38}};
+	//lootPos[]={{0.54,-0.71,-8.11},{2.51,-1.84,12.38},{2.8,-0.67,12.38},{3.98,-1.49,12.38}};
+	lootPos[] = {{2.00415,-1.33325,12.3769},{0.0378418,-1.23608,-10.8254}};
 };
+// ALT-MAP Support 
+class Land_MBG_GER_HUS_4 : Residential // 2 stucco red/orage light by door
+{
+	zedPos[] = {{-3.01074,1.48145,-0.945732}};
+	lootPos[]={{-4.05176,0.607422,-0.112886},{4.31885,2.46094,-0.112885},{4.58203,-2.88672,-0.112886},{5.85449,1.11523,-3.11289},{3.30811,-5.375,-3.11289},{-3.5708,6.20703,-3.11288}};
+};
+class Land_MBG_GER_RHUS_2 : Residential // cement 1 door 4 windows
+{
+	zedPos[] = {{-2.77441,-3.31738,-3.36569}};
+	lootPos[]={{2.33398,-1.23145,-3.36569},{2.08203,-1.7998,-0.465693},{-0.678711,-4.04883,-0.465693},{2.33008,3.3291,-0.465692}};
+};
+class Land_MBG_GER_PUB_2 : Residential // fionas irish pub
+{
+	zedPos[] = {{4.20264,-3.15381,-3.53086},{-6.24268,-4.08228,-3.53085}};
+	lootPos[]={{-0.338867,-5.44336,-3.53086},{-2.61182,-4.51978,-3.53086},{-6.23779,-2.42676,-3.53085},{4.42334,-4.17285,-0.630859},{3.15088,4.45898,-0.630852}};
+};
+class Land_sara_domek_vilka : Residential // reddish villa - no entry
+{
+	lootPos[]={{-5.53467,-1.77637,-4.17358},{3.11279,6.25879,-4.1599},{0.339844,7.14258,-4.1599}};
+};
+class Land_mbg_apartments_big_01 : Residential // brick with archways, limited access
+{
+	lootPos[]={{-4.7915,4.07861,4.80171},{-6.07764,-4.86182,4.80168},{9.38916,-7.12158,-1.05012},{-11.3857,-5.63916,-1.05012},{-11.2231,8.8335,-1.05013},{11.4961,7.89697,-1.05012},{4.59082,-5.81592,-4.34196}};
+};
+// ALT-MAP Support 

 //DZE ADDED BELOW
 class land_rozvodna: Residential {
 	lootPos[] = {{-6.8208,-1.58789,-0.369419}};
 };
-class land_jzd_bezstrechy: Residential {
+class land_jzd_bezstrechy: Residential { // multi-story concrete bars on windows
+	zedPos[] = {{6.62451,1.67969,-5.22504},{5.60889,6.54102,-5.10962}};
+	//lootPos[] = {{6.62451,1.67969,-5.22504},{1.70166,3.48828,-5.22504},{5.60889,6.54102,-5.10962},{-5.21094,7.38477,-5.10962}};
 	lootPos[] = {{-10.4614,-2.97461,-5.22504},{0.170898,0.177734,-5.22504},{-0.368652,-3.34668,-5.22504},{0.905762,2.52344,-5.22504},{0.802246,2.12305,-0.40476},{1.05615,1.88574,-3.01179},{8.00244,0.787109,-5.22504}};
 };
-class land_domek_podhradi_1: Residential {
+class land_domek_podhradi_1: Residential { // brown wooden barn one story
+	zedPos[] = {{-2.18018,-3.02637,-2.75047},{-0.874756,3.29346,-2.7391}};
+	//lootPos[] = {{5.11816,0.963867,-2.73913},{1.84717,-0.317383,-2.73914},{-5.66992,0.883789,-2.75047},{0.924805,-2.87988,-2.75047},{2.50977,-0.691406,-2.73915},{-0.874756,3.29346,-2.7391}, {-2.71924,0.0463867,-2.73914}};
 	lootPos[] = {{5.20862,3.45215,-2.7391},{3.04761,1.61621,-2.73912},{2.7594,-1.33691,-2.73915},{-3.32617,4.14404,-2.73909}};
 };
 class Land_bouda2_vnitrek: Residential {
@@ -315,67 +400,100 @@ class land_senik: Residential {
 class land_zd_1: Residential {
 	lootPos[] = {{2.14258,3.37402,-3.67255},{-1.60645,-3.25098,-3.67255},{0.649902,-2.38086,-3.67255},{-1.16113,1.41406,-3.67255},{2.88721,-2.80078,-3.67255},{-4.45117,-3.0127,-4.04225},{-5.94385,3.13867,-4.04225}};
 };
-class Land_dum_ras: Residential {
+class Land_dum_ras: Residential { // stucco 1 window, 2 doors
+	zedPos[] = {{0.891602,2.02539,-2.66959},{0.189453,-3.6333,-2.66958},{0.952148,2.08594,0.272604}};
+	//lootPos[] = {{0.891602,2.02539,-2.66959},{0.189453,-3.6333,-2.66958},{0.952148,2.08594,0.272604}};
 	lootPos[] = {{-1.53223,3.34424,-2.66958},{1.36621,-0.507813,-2.66958},{0.860352,3.72705,0.272604},{-0.767578,-1.96289,0.272604},{-0.27832,-3.96045,0.272604}};
 };
 class land_plynom: Residential {
 	lootPos[] = {{1.07568,-0.65625,2.21929},{-0.184082,-1.46973,2.21929},{-1.24854,-0.0126953,2.21929},{1.1377,-0.887695,-2.60304},{-1.3877,0.386719,-2.60304},{-0.822754,-1.33398,-2.60304}};
 };
-class land_x_vez_tex: Residential {
+class land_x_vez_tex: Residential { // brick tower
+	zedPos[] = {{-0.80957,1.62183,-4.59428}};
+	//lootPos[] = {{-0.80957,1.62183,-4.59428},{-1.18555,0.894531,-4.59901},{-0.114258,1.20581,-0.273163},{-3.95801,5.15552,-0.271477}};
 	lootPos[] = {{0.433105,-1.02734,-0.273926},{1.00391,3.02197,-0.272713},{1.36426,0.449219,-0.273571},{-1.89795,3.22168,-0.27232},{-5.00537,-3.64307,-0.274128}};
 };
 class land_marsh1: Residential {
 	lootPos[] = {{3.76953,-5.73193,-3.95897},{-0.986816,-4.26074,-3.95897},{2.52637,0.376465,-3.95897},{4.78955,2.92969,-3.95897},{4.56543,6.82227,-3.95897},{-2.88184,4.24121,-4.01684}};
 };
-class land_seb_bouda1: Residential {
+class land_seb_bouda1: Residential { // cement floor1, wooden floor2
+	zedPos[] = {{-2.27832,0.0546875,0.573326},{-0.192871,-2.34766,1.13067}};
+	//lootPos[] = {{-2.27832,0.0546875,0.573326},{-0.192871,-2.34766,1.13067}};
 	lootPos[] = {{2.49316,-2.44238,1.13067},{-0.645996,-2.44824,1.13067},{-0.924316,-0.460938,0.573963},{-2.89697,1.9043,0.571716},{2.80566,1.2334,-3.28989},{-2.38672,-0.893555,-3.28989},{-2.7666,2.41699,-3.28989}};
 };
 class land_cihlovej_dum_mini: Residential {
 	lootPos[] = {{-2.4646,-0.78418,-2.86942},{-1.75586,2.88525,-2.86942},{2.76587,2.08154,-2.86942},{1.96265,-1.98877,-2.86942},{0.0109863,0.876465,-2.86942},{0.116455,3.05762,-2.86942}};
 };
 class Land_hruzdum: Residential {
-	lootPos[] = {{-1.67188,3.71826,-4.72847},{-2.52295,-1.02246,-1.16867},{-1.94971,1.22021,1.5983}};
+	lootPos[] = {
+		{-1.67188,3.71826,-4.72847},{-2.52295,-1.02246,-1.16867},{-1.94971,1.22021,1.5983}
+	};
+	lootPosSmall[] = {
+		{-2.84448,0.796875,2.35386},{2.79614,3.2666,-1.15755},{-3.03979,2.35303,-4.72847}
+	};
 	zedPos[] = {{-1.66382,-1.14795,-3.82291},{-2.79248,3.60742,-0.251995}};
-	lootPosSmall[] = {{-2.84448,0.796875,2.35386},{2.79614,3.2666,-1.15755},{-3.03979,2.35303,-4.72847}};
 };
-class Land_cihlovej_dum_in: Residential {
+class Land_cihlovej_dum_in: Residential { // door, red-blu light, 2 windows
+	zedPos[] = {{-1.69922,0.681641,-1.8147}};
+	//lootPos[]={{-1.69922,0.681641,-1.8147},{1.97852,1.83496,-5.27588},{-1.44531,0.173828,-1.81471},{-0.0527344,-1.43359,-1.81472}};
 	lootPos[] = {{-0.0117188,0.0441895,-1.81473},{-1.76758,2.24805,-1.8147},{-2.88965,-1.64795,-1.8147},{1.84277,-2.07983,-1.81471},{1.58691,-1.3374,-5.27588},{1.22852,2.57324,-5.27588}};
 };
 class land_smd_cihlovej_dum_mini: Residential {
-	lootPos[] = {{0.623047,2.39746,-2.58942},{0.0996094,0.995117,-2.86942},{-4.05957,-1.01953,-2.86942},{-8.86328,2.89453,-2.86942}};
+	lootPos[] = {
+		{0.623047,2.39746,-2.58942},{0.0996094,0.995117,-2.86942},{-4.05957,-1.01953,-2.86942},{-8.86328,2.89453,-2.86942}
+	};
+	lootPosSmall[] = {
+		{2.89453,-1.72852,-1.91942},{2.92773,-2.3418,-2.86942},{-6.09668,3.10938,-2.86942},{-2.19629,2.9375,-2.86942}
+	};
 	zedPos[] = {{1.81738,0.794922,-1.99442},{-1.7959,1.10742,-1.99442},{-6.54102,1.04688,-1.99442}};
-	lootPosSmall[] = {{2.89453,-1.72852,-1.91942},{2.92773,-2.3418,-2.86942},{-6.09668,3.10938,-2.86942},{-2.19629,2.9375,-2.86942}};
 };
 class land_smd_dum_istan4: Residential {
 	lootPos[] = {{2.60742,-2.42188,-4.35237}};
 	zedPos[] = {{0.323242,5.66113,-6.38088}};
-	lootPosSmall[] = {};
 };
 class land_smd_dum_olez_istan2_open2: Residential {
-	lootPos[] = {{-0.162109,4.91846,-0.431501},{3.25391,2.52246,-0.421501},{-3.51953,-3.80176,0.128499},{-1.56934,0.389648,-0.411501}};
+	lootPos[] = {
+		{-0.162109,4.91846,-0.431501},{3.25391,2.52246,-0.421501},{-3.51953,-3.80176,0.128499},{-1.56934,0.389648,-0.411501}
+	};
+	lootPosSmall[] = {
+		{-6.44629,0.00488281,0.198499},{-4.30762,5.7207,0.568499},{0.628906,4.8291,0.338499},{-3.94824,-3.03906,0.128499},{1.19629,-5.44629,-0.0115013}
+	};
 	zedPos[] = {{5.4502,-3.21729,0.207455}};
-	lootPosSmall[] = {{-6.44629,0.00488281,0.198499},{-4.30762,5.7207,0.568499},{0.628906,4.8291,0.338499},{-3.94824,-3.03906,0.128499},{1.19629,-5.44629,-0.0115013}};
 };
 class land_smd_dum_olez_istan2_open: Residential {
-	lootPos[] = {{0.0185547,4.61133,0.0584984},{0.412598,-4.66211,0.338498},{-5.71582,5.63477,-0.431501},{-4.5127,-4.87695,-0.431501}};
+	lootPos[] = {
+		{0.0185547,4.61133,0.0584984},{0.412598,-4.66211,0.338498},{-5.71582,5.63477,-0.431501},{-4.5127,-4.87695,-0.431501}
+	};
+	lootPosSmall[] = {
+		{-1.46338,6.05078,0.718499},{-4.68652,-3.71973,0.528499},{-0.162109,-4.69238,0.0184984},{-6.41113,5.08398,0.798498}
+	};
 	zedPos[] = {{4.92383,-3.12109,0.0317497}};
-	lootPosSmall[] = {{-1.46338,6.05078,0.718499},{-4.68652,-3.71973,0.528499},{-0.162109,-4.69238,0.0184984},{-6.41113,5.08398,0.798498}};
 };
 class land_smd_dum_olez_istan1_open: Residential {
-	lootPos[] = {{-5.4375,-4.38379,1.35497},{5.75781,-3.31934,1.35497},{1.53516,-2.0625,1.35497},{-2.14941,-4.56445,-1.85398},{-6.79688,2.14453,-1.84398},{3.61523,-0.371094,-1.824}};
+	lootPos[] = {
+		{-5.4375,-4.38379,1.35497},{5.75781,-3.31934,1.35497},{1.53516,-2.0625,1.35497},{-2.14941,-4.56445,-1.85398},{-6.79688,2.14453,-1.84398},{3.61523,-0.371094,-1.824}
+	};
+	lootPosSmall[] = {
+		{-6.11914,-4.14453,2.16497},{2.4707,3.67773,1.96497},{6.42773,-0.5,1.34497},{7.48047,2.37109,-1.434},{-1.98047,-4.16504,-1.07398},{-7.60254,-4.06348,-0.883982},{-7.74902,2.51074,-1.16398},{5.85352,2.37695,-1.854}
+	};
 	zedPos[] = {{1.33691,-5.02441,-1.5178},{-4.22168,4.75391,-1.66303}};
-	lootPosSmall[] = {{-6.11914,-4.14453,2.16497},{2.4707,3.67773,1.96497},{6.42773,-0.5,1.34497},{7.48047,2.37109,-1.434},{-1.98047,-4.16504,-1.07398},{-7.60254,-4.06348,-0.883982},{-7.74902,2.51074,-1.16398},{5.85352,2.37695,-1.854}};
 };
 class land_smd_dum_istan3_hromada: Residential {
-	lootPos[] = {{0.293945,-1.60156,-3.328},{-1.91406,-1.65332,-3.328}};
+	lootPos[] = {
+		{0.293945,-1.60156,-3.328},{-1.91406,-1.65332,-3.328}
+	};
+	lootPosSmall[] = {
+		{0.551758,-4.12695,-3.328},{0.626953,-0.547852,-3.328}
+	};
 	zedPos[] = {{-0.154297,5.01172,-2.46689},{-9.95117,1.99902,-2.46689},{10.2998,1.82227,-2.68886}};
-	lootPosSmall[] = {{0.551758,-4.12695,-3.328},{0.626953,-0.547852,-3.328}};
 };

 class land_panelova3: Residential {
 	lootPos[] = {{-0.0615234,2.92871,0.0510063},{6.44482,-0.967773,0.0510063},{6.26807,-3.85547,0.0510063},{-0.0327148,-5.30273,0.0510063}};
 };
-class land_vysoky2: Residential {
+class land_vysoky2: Residential { // multi-story cement apt buildings. no room access
+	zedPos[] = {{-0.219727,2.5332,13.2833}};
+	//lootPos[] = {{-0.219727,2.5332,13.2833},{-1.83179,7.09766,13.2833},{-7.15039,-8.02441,13.2833},{4.60986,-8.9209,13.2833},{12.3555,5.91992,13.2833}};
 	lootPos[] = {{6.74121,-2.95508,-15.7673},{6.63232,4.17676,-15.7673},{0.72998,-2.63574,-15.7051},{1.1958,0.116211,-15.6513},{2.84131,2.35742,13.1248},{-0.51123,2.16699,13.1248},{4.37012,0.773438,13.1248},{9.61328,13.2432,13.1248},{6.39307,-12.292,13.1248}};
 };
 class land_vysoky1: Residential {
@@ -387,7 +505,9 @@ class land_hotel_p2: Residential {
 class land_hotel_p1: Residential {
 	lootPos[] = {{-12.1006,-3.29248,-4.92428},{-3.09375,-1.66357,-4.92429},{-1.78125,3.53271,-4.92429},{-5.97852,3.80273,-4.92428},{13.8809,1.77246,-1.39091},{13.751,-9.81104,-1.39091},{12.1787,0.0078125,-3.22923}};
 };
-class land_dlouhy1: Residential {
+class land_dlouhy1: Residential { // multi-story cement apt buildings. some room access
+	zedPos[] = {{-3.36914,7.95166,-4.95796},{-3.00684,-1.46973,-9.47917}};
+	//lootPos[] = {{-3.36914,7.95166,-4.95796},{-4.4248,-1.81055,-4.96283},{25.0264,-1.64648,-4.96281},{25.6738,8.21387,-4.95789},{15.626,11.2983,-4.95636},{6.11328,6.86816,-9.48532}, {-13.5742,-1.67822,-9.47203}, {-3.00684,-1.46973,-9.47917}};
 	lootPos[] = {{-6.40918,-0.21875,-9.60495},{-12.395,2.47559,-9.60091},{1.38428,3.15332,-9.61021},{1.91748,8.89746,-9.61057},{-6.90918,8.53027,-9.60461},{-12.3315,8.00195,-9.60096},{-17.9946,9.73926,-9.59713},{-9.91797,5.16699,-9.60259},{6.95801,9.37988,-9.61397},{4.39404,7.64941,-9.61224},{5.43994,9.80469,-5.09157},{0.418457,-0.611328,-5.09031},{-5.27051,7.41895,-5.08631},{2.20361,8.79004,-5.09157},{-8.93848,6.08301,-5.08698},{-9.49854,11.3086,-5.08437},{9.38232,1.54199,-5.09157},{8.95361,9.74707,-5.09157},{11.436,11.4756,-5.08435}};
 };
 class land_dlouhy2: Residential {
@@ -575,8 +695,10 @@ class LAND_Kiosk2 : Residential
 		{7.84668,20.991,4.76736},
 		{6.91211,27.9067,10.1178}};
 };
-class Land_deutshe_mini : Residential
+class Land_deutshe_mini : Residential // stucco 3 windows, doorway
 {
+	zedPos[] = {{2.51074,-2.4657,-2.74846},{2.51953,1.31262,-2.74846}};
+	//lootPos[] = {{2.51074,-2.4657,-2.74846},{2.51953,1.31262,-2.74846}};
 	lootPos[] = {
 		{-4.34277,-2.54297,-2.74846},
 		{-0.624023,-0.357422,-2.74846},
@@ -593,8 +715,10 @@ class LAND_vokzal_big: Residential
 		{-7.07227,1.28223,-7.96283}};
 };

-class Land_dum_mesto2: Residential
+class Land_dum_mesto2: Residential // 2 stucco red/orange light by door
 {
+	zedPos[] = {{-3.01074,1.48145,-0.945732}};
+	//lootPos[]={{1.31836,4.90625,-4.34475},{-3.01074,1.48145,-0.945732},{-1.86816,4.46582,-0.944004},{-1.43652,-1.51563,-0.944004},{1.40234,-7.55664,-0.944},{1.05273,5.43994,-4.34475}};
 	lootPos[] = {
 		{2.46582,7.10742,-4.34475},
 		{2.87305,4.03906,-4.34475},
@@ -611,19 +735,27 @@ class Land_dum_mesto2: Residential
 		{1.21973,-1.07617,-0.944004}};
 };

-class Land_sara_Domek_sedy: Residential
+class Land_sara_Domek_sedy: Residential // single story stucko #39
 {
+	zedPos[] = {{1.72266,2.12744,-2.14196}};
+	//lootPos[]={{4.39453,3.2583,-2.14196},{-5.47656,1.50586,-2.14196},{-1.81445,1.95605,-2.14196}};
 	lootPos[] = {
 		{-1.76367,-1.11328,-2.14196},
 		{-5.0127,3.01953,-2.14196},
 		{5.41211,2.625,-2.14196},
 		{4.86035,-0.738281,-2.14196}};
 };
-class Land_dum_rasovna: Residential
+class Land_dum_rasovna: Residential // old stucco window-dor-door tile roof
 {
-	lootPos[] = {{-1.271,3.38281,-2.69958},{3.14893,3.86255,-2.69958},{3.30957,-4.17871,-2.69958},{-0.936523,-1.97412,0.242605},{1.05518,3.77271,0.242605}};
+	//lootPos[]={{-1.11914,0.794922,-2.66958},{-0.580078,-3.34766,-2.66958},{1.80664,2.07227,0.272606}};
+	lootPos[] = {
+		{-1.271,3.38281,-2.69958},{3.14893,3.86255,-2.69958},{3.30957,-4.17871,-2.69958},{-0.936523,-1.97412,0.242605},{1.05518,3.77271,0.242605}
+	};
+	lootPosSmall[] = {
+		{-0.964844,-3.52148,0.952604},{0.613281,-0.726807,-2.69958},{3.69873,-1.69995,-2.69958}
+	};
+	//zedPos[] = {{-1.11914,0.794922,-2.66958}};
 	zedPos[] = {{-1.08252,-1.93018,-1.79458},{-1.68555,2.19971,-1.79458}};
-	lootPosSmall[] = {{-0.964844,-3.52148,0.952604},{0.613281,-0.726807,-2.69958},{3.69873,-1.69995,-2.69958}};
 };
 class land_sara_domek_kovarna: Residential
 {
@@ -631,9 +763,13 @@ class land_sara_domek_kovarna: Residential
 };
 class land_sara_domek_hospoda: Residential
 {
-	lootPos[] = {{-2.14844,-3.56396,-2.74878}};
+	lootPos[] = {
+		{-2.14844,-3.56396,-2.74878}
+	};
+	lootPosSmall[] = {
+		{-1.16064,-4.72485,-2.75951}
+	};
 	zedPos[] = {{1.48291,-3.28223,-1.85291}};
-	lootPosSmall[] = {{-1.16064,-4.72485,-2.75951}};
 };

 class Land_majak_podesta: Residential
@@ -643,8 +779,10 @@ class Land_majak_podesta: Residential
 		{1.14844,-2.9707,2.28329}};
 };

-class land_mbg_brickhouse_01: Residential
+class land_mbg_brickhouse_01: Residential // 2 story brick outer staircase stripped
 {
+	zedPos[] = {{2.13965,2.89258,-3.35652}};
+	//lootPos[]={{2.13965,2.89258,-3.35652},{-3.04443,1.43359,-3.35652},{1.77637,1.81055,-0.051506}};
 	lootPos[] = {
 		{-7.06543,4.02197,-0.051506},
 		{5.55518,-0.523438,-0.051506},
@@ -656,9 +794,13 @@ class land_mbg_brickhouse_01: Residential

 class land_nasypka: Residential
 {
-	lootPos[] = {{-1.46045,-0.168945,6.56824}};
+	lootPos[] = {
+		{-1.46045,-0.168945,6.56824}
+	};
+	lootPosSmall[] = {
+		{-1.58691,0.717285,6.56824}
+	};
 	zedPos[] = {{1.50659,-0.027832,-5.55527}};
-	lootPosSmall[] = {{-1.58691,0.717285,6.56824}};
 };

 class Land_dum_istan3_pumpa: Residential
@@ -734,8 +876,10 @@ class land_hut04: Residential
 		{ 0.939697,2.78271,-0.437198 }};
 };

-class Land_dum_mesto_in: Residential
+class Land_dum_mesto_in: Residential // 2 story some boarded windows estate
 {
+	zedPos[] = {{4.85645,1.62305,-1.28095}};
+	//lootPos[]={{-4.05469,4.21289,-4.26331},{4.85645,1.62305,-1.28095},{-3.86035,-4.19531,-1.11247}};
 	lootPos[] = {
 		{ -5.53796,-2.51996,-3.99769 },
 		{ -4.66113,1.34052,-4.26331 },
@@ -757,33 +901,59 @@ class Land_dum_istan3_hromada2: Residential
 	lootPos[] = {
 		{ 1.67627,3,-4.62603 },
 		{ -1.47363,4.92285,-1.28517 },
-		{ 6.43848,1.93555,2.08801 }};
+		{ 6.43848,1.93555,2.08801 }
+	};
+	lootPosSmall[] = {
+		{7.02344,5.71191,2.08801},
+		{0.856445,-1.72266,-1.28517},
+		{-2.51758,1.2002,-1.28517},
+		{5.18945,2.93848,-4.62604}
+	};
 	zedPos[] = {{-1.77148,2.59961,-0.410172},{4.46387,1.85254,-3.75103}};
-	lootPosSmall[] = {{7.02344,5.71191,2.08801},{0.856445,-1.72266,-1.28517},{-2.51758,1.2002,-1.28517},{5.18945,2.93848,-4.62604}};
 };
-class land_mbg_ger_rhus_1: Residential {
+class land_mbg_ger_rhus_1: Residential { // brick 1 door 4 windows
 	lootChance = 0.3;
-	lootPos[] = {{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}};
+	//lootPos[]={{-1.69922,0.681641,-1.8147},{1.97852,1.83496,-5.27588},{-1.44531,0.173828,-1.81471},{-0.0527344,-1.43359,-1.81472}};
+	lootPos[] = {
+		{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}
+	};
+	lootPosSmall[] = {
+		{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}
+	};
+	//zedPos[] = {{-1.69922,0.681641,-1.8147}};
 	zedPos[] = {{-2.03125,6.38867,-2.93606},{-8.33398,-5.82813,-2.73209}};
-	lootPosSmall[] = {{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}};
 };
-class land_mbg_killhouse_4: Residential {
-	lootPos[] = {{7.22266,-4.10205,-3.84318},{-2.04883,0.195313,-3.84318},{-6.33398,2.08691,-3.84318},{3.6582,0.32666,-3.84318},{7.24805,6.55469,-3.84318},{6.74023,2.40967,-0.543176},{-1.83203,2.08301,-0.543176},{6.85742,0.0131836,-0.543176},{-1.89258,-0.352051,-0.543176}};
+class land_mbg_killhouse_4: Residential { // cement 2 story 
+	//lootPos[] = {{2.97949,2.16211,-3.84318},{6.88184,-3.24219,-3.84317},{-3.87012,5.46484,-3.84317},{0.474609,-5.08398,-0.543175},{6.9248,2.49219,-0.543175},{-2.39063,-0.128906,-0.543179}};
+	lootPos[] = {
+		{7.22266,-4.10205,-3.84318},{-2.04883,0.195313,-3.84318},{-6.33398,2.08691,-3.84318},{3.6582,0.32666,-3.84318},{7.24805,6.55469,-3.84318},{6.74023,2.40967,-0.543176},{-1.83203,2.08301,-0.543176},{6.85742,0.0131836,-0.543176},{-1.89258,-0.352051,-0.543176}
+	};
+	lootPosSmall[] = {
+		{2.41992,-4.59082,-3.84318},{-1.61133,-4.5249,-3.84318},{2.61719,3.53076,-3.84318},{7.63867,6.79102,-0.543176},{2.54883,6.95605,-0.543176},{-1.70898,6.92188,-0.543176},{2.70313,-1.13672,-0.543176},{-6.58008,-4.49268,-0.543176}
+	};
+	//zedPos[] = {{2.97949,2.16211,-3.84318},{-3.87012,5.46484,-3.84317},{6.9248,2.49219,-0.543175}};
 	zedPos[] = {{0.597656,-6.93311,-3.62662},{-8.15625,1.8877,-3.62662}};
-	lootPosSmall[] = {{2.41992,-4.59082,-3.84318},{-1.61133,-4.5249,-3.84318},{2.61719,3.53076,-3.84318},{7.63867,6.79102,-0.543176},{2.54883,6.95605,-0.543176},{-1.70898,6.92188,-0.543176},{2.70313,-1.13672,-0.543176},{-6.58008,-4.49268,-0.543176}};
 };

 class Land_House_C_1_EP1: Residential
 {
-	lootPos[] = {{-3.62476,-1.83301,-0.967744},{3.19263,-2.92676,-0.937744},{7.94824,-1.15381,-0.957744}};
+	lootPos[] = {
+		{-3.62476,-1.83301,-0.967744},{3.19263,-2.92676,-0.937744},{7.94824,-1.15381,-0.957744}
+	};
+	lootPosSmall[] = {
+		{-7.64917,-2.33325,-0.257745},{-2.65161,-2.34473,-0.717744},{2.07666,-3.62549,-0.0177441},{7.56982,-2.3689,-0.257744},{2.6355,-1.62378,-0.947745}
+	};
 	zedPos[] = {{-5.45166,-0.360596,-0.0527439},{5.60938,-1.80347,-0.0527439}};
-	lootPosSmall[] = {{-7.64917,-2.33325,-0.257745},{-2.65161,-2.34473,-0.717744},{2.07666,-3.62549,-0.0177441},{7.56982,-2.3689,-0.257744},{2.6355,-1.62378,-0.947745}};
 };
 class Land_House_C_2_EP1: Residential
 {
-	lootPos[] = {{-3.63477,2.83398,-2.27891},{5.94116,1.08691,-2.30269},{0.387207,1.1936,-1.47782},{5.49438,-1.47388,1.56868},{-2.24487,-1.44019,0.547503},{-2.01343,3.41553,0.547503},{5.06909,1.21997,0.746294},{5.75464,-4.69043,0.794252}};
+	lootPos[] = {
+		{-3.63477,2.83398,-2.27891},{5.94116,1.08691,-2.30269},{0.387207,1.1936,-1.47782},{5.49438,-1.47388,1.56868},{-2.24487,-1.44019,0.547503},{-2.01343,3.41553,0.547503},{5.06909,1.21997,0.746294},{5.75464,-4.69043,0.794252}
+	};
+	lootPosSmall[] = {
+		{0.1604,1.06812,-2.00456},{-0.469482,1.10962,-2.2006},{1.1167,0.707031,-1.78269},{-1.62158,-1.72437,1.1175},{-1.63965,-1.27368,1.4575},{5.88379,-3.06787,1.17425},{-2.31738,3.16724,1.3775},{-1.8562,3.80322,1.3775},{-0.393799,3.50586,-1.61131},{6.06934,0.0444336,-2.07269},{-1.95215,-1.91943,-2.33913},{2.17334,-1.75024,0.74663}
+	};
 	zedPos[] = {{-0.131592,3.38794,1.63951},{-4.25537,1.24023,1.4225},{2.3269,1.89136,-1.43735},{-1.87183,-0.48584,-1.4121},{1.21802,-1.58765,1.67137}};
-	lootPosSmall[] = {{0.1604,1.06812,-2.00456},{-0.469482,1.10962,-2.2006},{1.1167,0.707031,-1.78269},{-1.62158,-1.72437,1.1175},{-1.63965,-1.27368,1.4575},{5.88379,-3.06787,1.17425},{-2.31738,3.16724,1.3775},{-1.8562,3.80322,1.3775},{-0.393799,3.50586,-1.61131},{6.06934,0.0444336,-2.07269},{-1.95215,-1.91943,-2.33913},{2.17334,-1.75024,0.74663}};
 };
 class Land_House_C_3_EP1: Residential
 {
@@ -824,15 +994,23 @@ class Land_House_C_5_V2_EP1: Residential
 };
 class Land_House_C_5_V3_EP1: Residential
 {
-	lootPos[] = {{2.43799,1.03662,2.2605},{-1.00391,-3.9248,1.22732},{0.83374,4.91699,-0.671498},{-1.63037,3.66699,-1.4815},{-1.24463,-3.43701,-1.4815}};
+	lootPos[] = {
+		{2.43799,1.03662,2.2605},{-1.00391,-3.9248,1.22732},{0.83374,4.91699,-0.671498},{-1.63037,3.66699,-1.4815},{-1.24463,-3.43701,-1.4815}
+	};
+	lootPosSmall[] = {
+		{3.44287,1.23535,1.4205},{3.64917,3.85156,1.4605},{-0.623779,-5.09424,1.24732},{2.31201,0.770996,-0.0414982},{2.53198,0.82959,-0.731498},{1.81738,5.23926,-1.4815},{-4.40332,0.501465,-1.0415},{-0.46582,-2.83594,-1.0815},{-0.466797,-3.58984,-0.401499}
+	};
 	zedPos[] = {{-3.54736,1.73535,-0.596497},{2.47021,4.54834,-0.59645},{1.73682,2.96338,2.2955},{-3.40234,-4.05664,2.18232}};
-	lootPosSmall[] = {{3.44287,1.23535,1.4205},{3.64917,3.85156,1.4605},{-0.623779,-5.09424,1.24732},{2.31201,0.770996,-0.0414982},{2.53198,0.82959,-0.731498},{1.81738,5.23926,-1.4815},{-4.40332,0.501465,-1.0415},{-0.46582,-2.83594,-1.0815},{-0.466797,-3.58984,-0.401499}};
 };
 class Land_House_C_5_V1_EP1: Residential
 {
-	lootPos[] = {{1.01025,4.85181,-1.4815},{3.42773,1.4248,-1.4915},{-1.62939,-4.69336,-1.4815},{-1.56982,3.66333,-1.4915},{2.28418,1.03076,2.2605},{-0.941895,-3.75952,1.16351}};
+	lootPos[] = {
+		{1.01025,4.85181,-1.4815},{3.42773,1.4248,-1.4915},{-1.62939,-4.69336,-1.4815},{-1.56982,3.66333,-1.4915},{2.28418,1.03076,2.2605},{-0.941895,-3.75952,1.16351}
+	};
+	lootPosSmall[] = {
+		{0.615479,4.92847,-0.671498},{2.23071,0.780518,-0.411497},{2.61011,0.823975,-1.0915},{-4.35205,-0.0966797,-1.0515},{-0.5271,-2.93677,-1.4215},{-4.2854,3.09082,-1.4715},{-4.42822,-5.13232,-1.4815},{-0.468018,-3.18481,-0.0414963},{2.96582,1.17114,2.2605},{1.85205,4.83716,1.7605}
+	};
 	zedPos[] = {{-3.11206,1.50952,-0.596497},{2.39453,4.8396,-0.592795},{1.48633,3.10425,2.2955}};
-	lootPosSmall[] = {{0.615479,4.92847,-0.671498},{2.23071,0.780518,-0.411497},{2.61011,0.823975,-1.0915},{-4.35205,-0.0966797,-1.0515},{-0.5271,-2.93677,-1.4215},{-4.2854,3.09082,-1.4715},{-4.42822,-5.13232,-1.4815},{-0.468018,-3.18481,-0.0414963},{2.96582,1.17114,2.2605},{1.85205,4.83716,1.7605}};
 };
 class Land_House_K_6_EP1: Residential
 {
@@ -862,9 +1040,13 @@ class Land_House_C_9_EP1: Residential
 };
 class Land_House_C_10_EP1: Residential
 {
-	lootPos[] = {{-0.476807,-6.18408,-4.2081},{-2.19189,-2.32666,-4.19943},{0.970459,5.15942,-4.19894},{2.09814,8.11133,-4.19852},{0.209961,8.65503,-4.19772},{-1.55542,-2.83594,-0.0197258},{0.849854,-5.49219,-0.869633},{-1.56226,8.49561,-0.878298},{-4.927,0.8396,-0.574228},{-2.1604,8.40674,2.47196},{2.02271,5.81372,5.22763},{-2.17822,1.53076,-0.878794}};
+	lootPos[] = {
+		{-0.476807,-6.18408,-4.2081},{-2.19189,-2.32666,-4.19943},{0.970459,5.15942,-4.19894},{2.09814,8.11133,-4.19852},{0.209961,8.65503,-4.19772},{-1.55542,-2.83594,-0.0197258},{0.849854,-5.49219,-0.869633},{-1.56226,8.49561,-0.878298},{-4.927,0.8396,-0.574228},{-2.1604,8.40674,2.47196},{2.02271,5.81372,5.22763},{-2.17822,1.53076,-0.878794}
+	};
+	lootPosSmall[] = {
+		{-3.52124,-9.30933,-4.20103},{0.401611,-0.616211,-4.19847},{-1.30835,9.25757,-4.11613},{-0.946045,9.29761,-3.10613},{0.183594,9.23438,-2.74583},{1.15552,4.8877,-3.25071},{0.820313,4.84009,-3.58973},{-0.0129395,9.26294,-3.78608},{0.918701,-1.18433,-0.879436},{-2.12231,-2.69775,-0.399366},{-3.64014,4.15503,-0.268515},{-3.17114,0.63916,-0.878897},{2.64014,4.59009,2.47196},{0.853516,5.55664,5.22757},{2.84448,5.5791,2.47196},{3.43945,-9.37354,-0.879139},{1.83667,7.45825,-0.878618},{3.32861,-2.79565,-4.20015}
+	};
 	zedPos[] = {{0.153076,-2.36743,-3.31192},{-0.96167,-7.51587,-3.32074},{2.4646,5.95142,-3.2957},{-3.10596,6.55762,-3.29418},{2.66089,5.73584,0.00634003},{-1.50708,7.18359,0.00669289},{-0.899902,-4.46045,0.00529861}};
-	lootPosSmall[] = {{-3.52124,-9.30933,-4.20103},{0.401611,-0.616211,-4.19847},{-1.30835,9.25757,-4.11613},{-0.946045,9.29761,-3.10613},{0.183594,9.23438,-2.74583},{1.15552,4.8877,-3.25071},{0.820313,4.84009,-3.58973},{-0.0129395,9.26294,-3.78608},{0.918701,-1.18433,-0.879436},{-2.12231,-2.69775,-0.399366},{-3.64014,4.15503,-0.268515},{-3.17114,0.63916,-0.878897},{2.64014,4.59009,2.47196},{0.853516,5.55664,5.22757},{2.84448,5.5791,2.47196},{3.43945,-9.37354,-0.879139},{1.83667,7.45825,-0.878618},{3.32861,-2.79565,-4.20015}};
 };
 class Land_House_C_11_EP1: Residential
 {
@@ -914,9 +1096,13 @@ class Land_House_L_6_EP1: Residential
 };
 class Land_House_K_8_EP1: Residential
 {
-	lootPos[] = {{2.94263,2.71948,3.34996},{-0.0541992,3.51294,3.34996},{-2.81274,1.99365,0.231133},{-2.59253,3.66528,-1.81557},{-2.55493,-2.54126,-2.63675},{2.97803,-1.89355,-2.64059}};
+	lootPos[] = {
+		{2.94263,2.71948,3.34996},{-0.0541992,3.51294,3.34996},{-2.81274,1.99365,0.231133},{-2.59253,3.66528,-1.81557},{-2.55493,-2.54126,-2.63675},{2.97803,-1.89355,-2.64059}
+	};
+	lootPosSmall[] = {
+		{-0.681641,0.580322,3.54996},{1.30103,3.72339,3.81996},{1.45947,2.58374,3.34996},{-3.10376,-1.51025,3.34996},{-4.21533,1.6499,0.0964928},{3.22192,3.68018,0.234936},{-3.19409,-1.90552,0.496338},{3.31445,-0.210938,-1.82104},{3.00293,-0.161865,-2.16398},{0.443359,-3.27417,-2.67695},{-3.1377,1.33936,-2.2182}
+	};
 	zedPos[] = {{-2.60083,-1.24683,-1.66764},{3.30005,-1.26563,1.12351},{-0.615479,2.00049,1.1274},{-1.73755,2.1958,-1.708}};
-	lootPosSmall[] = {{-0.681641,0.580322,3.54996},{1.30103,3.72339,3.81996},{1.45947,2.58374,3.34996},{-3.10376,-1.51025,3.34996},{-4.21533,1.6499,0.0964928},{3.22192,3.68018,0.234936},{-3.19409,-1.90552,0.496338},{3.31445,-0.210938,-1.82104},{3.00293,-0.161865,-2.16398},{0.443359,-3.27417,-2.67695},{-3.1377,1.33936,-2.2182}};
 };
 class Land_House_K_5_EP1: Residential
 {
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/ResidentialRuins.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/ResidentialRuins.hpp
@@ -44,6 +44,21 @@ class MAP_sara_domek_vilka_ruins: ResidentialRuins {
 };

 class Land_ruin_01: ResidentialRuins {
-	lootPos[] = {{-4.26,-0.18,-1.46},{3.41,0.27,-1.71},{3,3.43,-1.5},{0.62,-1.74,-1.36},{4.55,-2.17,-1.73},{-5.05,3.07,-1.73}};
+	//lootPos[] = {{-4.26,-0.18,-1.46},{3.41,0.27,-1.71},{3,3.43,-1.5},{0.62,-1.74,-1.36},{4.55,-2.17,-1.73},{-5.05,3.07,-1.73}};
+	lootPos[] = {{-4.31934,-0.115234,-1.45578},{3.41309,0.270508,-1.71365},{3.00293,3.42773,-1.55765},{0.62207,-1.73779,-1.49048}};
 	zedPos[] = {{3.41309,0.271484,-1.71381},{3.00293,3.42773,-1.49768},{-4.25708,-0.181641,-1.45575},{0.622559,-1.73828,-1.36047}};
-};
+};
+// ALT-MAP Support 
+class Land_afbarabizna: ResidentialRuins {
+	lootPos[] = {{-1.29395,-2.97461,-4.22117}};
+	zedPos[] = {{-4.08594,2.62402,-4.22117},{4.95557,6.03857,-4.22117},{4.60156,5.50098,-0.168262},{-0.87793,-3.41406,-0.168266},{-0.065918,-1.86523,-0.512926}};
+};
+class Land_dum_zboreny: ResidentialRuins { //ruins
+	lootPos[] = {{3.74902,4.38379,-2.37675}};
+	zedPos[] = {{3.74902,4.38379,-2.37675},{-3.16797,3.21484,-2.37675},{-3.31787,3.25781,1.40384},{-5.35791,-1.67676,1.41383}};
+};
+class land_seb_residental: ResidentialRuins { //ruins
+	lootPos[] = {{3.74902,4.38379,-2.37675}};
+	zedPos[] = {{-4.70215,6.14648,-3.70411},{2.15479,8.1123,-3.7844},{-4.03955,6.47949,0.530872},{-4.41943,-7.93652,0.397972},{-1.40479,-7.99414,0.394527}};
+};
+// ALT-MAP Support 
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Roaming.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Roaming.hpp
@@ -14,9 +14,13 @@ class Land_Shed_W03 : HouseRoaming {};
 class Land_HouseV_2T1 : HouseRoaming {};
 class Land_HouseV_3I2 : HouseRoaming {};
 class land_housev_3i3: HouseRoaming  {
-	lootPos[] = {{-4.2334,0.291992,-1.47064},{1.10059,-2.99854,-0.790649},{3.53027,-2.34033,-1.74265}};
+	lootPos[] = {
+		{-4.2334,0.291992,-1.47064},{1.10059,-2.99854,-0.790649},{3.53027,-2.34033,-1.74265}
+	};
+	lootPosSmall[] = {
+		{-4.85645,0.550293,-0.340637},{2.21289,0.783691,-0.160645},{-0.833008,0.554199,-0.620636},{1.79785,-2.99902,-1.09064},{5.06055,-2.68164,-1.56265}
+	};
 	zedPos[] = {{-4.18457,-1.68164,-0.525635},{0.419922,-1.00781,-0.525635},{4.35059,-1.37939,-0.98764}};
-	lootPosSmall[] = {{-4.85645,0.550293,-0.340637},{2.21289,0.783691,-0.160645},{-0.833008,0.554199,-0.620636},{1.79785,-2.99902,-1.09064},{5.06055,-2.68164,-1.56265}};
 };
 class Land_HouseBlock_A1_2 : HouseRoaming {};
 class Land_HouseBlock_A2 : HouseRoaming {};
--- a/SQF/dayz_code/Configs/CfgLoot/Buildings/Supermarket.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Buildings/Supermarket.hpp
@@ -21,15 +21,25 @@ class Supermarket : Default
 class Land_A_GeneralStore_01a : Supermarket
 {
 	zedPos[] = {{0.902344,-4.36133,-1.20178},{13.9651,-4.50293,-1.20172},{-3.41382,-4.39063,-1.20172},{7.36304,3.00781,-1.20172},{7.53394,-2.70117,-1.20172},{10.2612,0.111328,-1.2016},{1.93018,2.17285,-1.2016},{-2.90942,1.32031,-1.2016},{3.27588,-3.48242,-1.2016},{3.5752,0.0361328,-1.2016},{3.72729,8.36133,-1.2016},{-3.82788,5.33203,-1.2016},{-6.93237,1.07617,-1.2016},{7.84424,-0.136719,-1.2016},{-0.370605,5.17871,-1.20154},{10.5864,-3.84277,-1.20148},{4.77783,5.57617,-1.20148},{-7.29565,-2.68164,-1.20148},{9.84009,8.33984,-1.20148},{-1.28857,-2.57715,-1.20135},{13.0864,4.35645,-1.19165},{12.9934,6.31836,-1.19153},{-7.55054,8.54199,-1.19141},{-4.42407,8.9668,-1.19135}};
-	lootPos[] = {{-6.93237,1.07617,-1.2016},{-7.29565,-2.68164,-1.20148},{-3.41382,-4.39063,-1.20172},{-1.28857,-2.57715,-1.20135},{0.902344,-4.36133,-1.20178},{3.27588,-3.48242,-1.2016},{7.53394,-2.70117,-1.20172},{13.9651,-4.50293,-1.20172},{10.2612,0.111328,-1.2016},{10.5864,-3.84277,-1.20148},{7.84424,-0.136719,-1.2016},{3.5752,0.0361328,-1.2016},{-0.370605,5.17871,-1.20154},{4.77783,5.57617,-1.20148},{13.0864,4.35645,-1.19165},{12.9934,6.31836,-1.19153},{7.36304,3.00781,-1.20172},{1.93018,2.17285,-1.2016},{-3.82788,5.33203,-1.2016},{-7.55054,8.54199,-1.19141},{-4.42407,8.9668,-1.19135},{3.72729,8.36133,-1.2016},{9.84009,8.33984,-1.20148},{-2.90942,1.32031,-1.2016}};
-	lootPosSmall[] = {{12.4678,4.51172,-1.20155},{12.2119,6.25098,-0.301548},{12.1895,3.68262,0.0484505},{11.8174,6.31689,-0.65155},{-8.67676,-2.41064,-1.13155},{-4.2002,-3.14355,-0.351551},{-0.165039,-1.3457,-0.351551},{14.6006,-1.38281,-0.351551},{3.03809,-5.03418,-0.351551},{0.512695,3.40527,-0.31155},{4.77637,6.76172,-0.301548},{7.27539,0.938477,-0.621552},{3.96777,1.00488,-0.621552},{0.389648,0.95459,-0.621552},{5.04004,3.44287,-0.65155},{1.85254,6.4248,-0.65155},{-3.65723,6.61133,-0.20155},{-4.39746,4.46191,-0.691551},{6.9248,6.38574,-1.01155},{2.77637,3.38477,-1.01155},{-0.217773,6.68066,-1.01155},{4.49707,-4.98828,0.408451},{-2.33203,-1.35205,0.408451},{2.0127,-1.36572,0.408451},{6.39746,-3.04395,0.408451},{14.6045,-0.722168,0.408451},{-2.43164,-3.73682,0.02845},{-4.77539,-1.35986,0.02845},{-0.436523,-3.04297,0.02845},{14.6104,-2.17139,0.02845},{12.6592,0.830078,0.34845},{4.00684,-3.15039,-0.351551},{2.7334,-3.0415,-0.731548},{-2.67676,-1.36133,-0.731548},{-1.00488,-5.00537,-0.731548},{8.34863,-1.43018,-0.731548},{1.8291,3.77197,-0.661549}};
+	lootPos[] = {
+		//{-6.93237,1.07617,-1.2016},{-7.29565,-2.68164,-1.20148},{-3.41382,-4.39063,-1.20172},{-1.28857,-2.57715,-1.20135},{0.902344,-4.36133,-1.20178},{3.27588,-3.48242,-1.2016},{7.53394,-2.70117,-1.20172},{13.9651,-4.50293,-1.20172},{10.2612,0.111328,-1.2016},{10.5864,-3.84277,-1.20148},{7.84424,-0.136719,-1.2016},{3.5752,0.0361328,-1.2016},{-0.370605,5.17871,-1.20154},{4.77783,5.57617,-1.20148},{13.0864,4.35645,-1.19165},{12.9934,6.31836,-1.19153},{7.36304,3.00781,-1.20172},{1.93018,2.17285,-1.2016},{-3.82788,5.33203,-1.2016},{-7.55054,8.54199,-1.19141},{-4.42407,8.9668,-1.19135},{3.72729,8.36133,-1.2016},{9.84009,8.33984,-1.20148},{-2.90942,1.32031,-1.2016},
+		{13.2969,4.94678,-1.20155},{2.97559,7.32373,-1.20155},{-8.35352,-0.0244141,-1.20155},{7.78223,4.45801,-1.20155},{6.59863,-0.292969,-1.20155},{-6.92285,-1.6709,-1.20155},{11.9189,-2.81885,-1.20155},{-1.85547,-2.16162,-1.20155}
+	};
+	lootPosSmall[] = {
+		{12.4678,4.51172,-1.20155},{12.2119,6.25098,-0.301548},{12.1895,3.68262,0.0484505},{11.8174,6.31689,-0.65155},{-8.67676,-2.41064,-1.13155},{-4.2002,-3.14355,-0.351551},{-0.165039,-1.3457,-0.351551},{14.6006,-1.38281,-0.351551},{3.03809,-5.03418,-0.351551},{0.512695,3.40527,-0.31155},{4.77637,6.76172,-0.301548},{7.27539,0.938477,-0.621552},{3.96777,1.00488,-0.621552},{0.389648,0.95459,-0.621552},{5.04004,3.44287,-0.65155},{1.85254,6.4248,-0.65155},{-3.65723,6.61133,-0.20155},{-4.39746,4.46191,-0.691551},{6.9248,6.38574,-1.01155},{2.77637,3.38477,-1.01155},{-0.217773,6.68066,-1.01155},{4.49707,-4.98828,0.408451},{-2.33203,-1.35205,0.408451},{2.0127,-1.36572,0.408451},{6.39746,-3.04395,0.408451},{14.6045,-0.722168,0.408451},{-2.43164,-3.73682,0.02845},{-4.77539,-1.35986,0.02845},{-0.436523,-3.04297,0.02845},{14.6104,-2.17139,0.02845},{12.6592,0.830078,0.34845},{4.00684,-3.15039,-0.351551},{2.7334,-3.0415,-0.731548},{-2.67676,-1.36133,-0.731548},{-1.00488,-5.00537,-0.731548},{8.34863,-1.43018,-0.731548},{1.8291,3.77197,-0.661549}
+	};
 };

 class Land_A_GeneralStore_01 : Supermarket
 {
 	zedPos[] = {{0.105713,-9.60449,-1.21088},{10.5925,-9.94238,-1.21088},{-4.85986,-10.4199,-1.21082},{13.3127,-7.64941,-1.2016},{-3.57446,4.46777,-1.2016},{11.1685,-3.7334,-1.20154},{13.3013,-1.77441,-1.20154},{-3.33813,0.615234,-1.20154},{-7.97754,-5.78418,-1.20154},{1.12256,-1.58691,-1.20148},{-6.80884,-1.23926,-1.20148},{-8.2251,-7.32227,-1.20148},{1.31885,1.4668,-1.20142},{1.6499,5.14746,-1.20142},{-2.02612,-7.64844,-1.20142},{3.78979,-5.69238,-1.20142},{8.89404,-8.37207,-1.20142},{-9.38428,4.46094,-1.20142},{-9.38843,-3.30176,-1.20142},{9.81201,1.43066,-1.20142},{-3.77539,-3.86621,-1.20135},{0.753906,-3.69336,-1.20129},{9.01367,3.84961,-1.20129}};
-	lootPos[] = {{-9.38843,-3.30176,-1.20142},{-3.77539,-3.86621,-1.20135},{1.31885,1.4668,-1.20142},{9.01367,3.84961,-1.20129},{13.3013,-1.77441,-1.20154},{9.81201,1.43066,-1.20142},{1.6499,5.14746,-1.20142},{0.753906,-3.69336,-1.20129},{13.3127,-7.64941,-1.2016},{11.1685,-3.7334,-1.20154},{8.89404,-8.37207,-1.20142},{-2.02612,-7.64844,-1.20142},{-7.97754,-5.78418,-1.20154},{-8.2251,-7.32227,-1.20148},{3.78979,-5.69238,-1.20142},{-9.38428,4.46094,-1.20142},{-3.57446,4.46777,-1.2016},{-3.33813,0.615234,-1.20154},{10.5925,-9.94238,-1.21088},{0.105713,-9.60449,-1.21088},{-4.85986,-10.4199,-1.21082},{-6.80884,-1.23926,-1.20148},{1.12256,-1.58691,-1.20148}};
-	lootPosSmall[] = {{11.0537,-0.321289,-0.661549},{11.0303,2.8833,0.0484514},{10.6646,1.86377,-0.651548},{6.66162,-2.69971,-0.611548},{6.02979,-2.6416,-0.611548},{2.16553,-2.68262,-0.611548},{-1.36963,-2.75684,-0.611548},{-0.919434,-0.283936,-0.301549},{0.583008,-0.308594,-1.01155},{0.804199,3.0752,-0.311549},{4.90234,3.04053,0.0484514},{-5.73779,0.694824,-0.20155},{0.796875,0.0898438,-0.301549},{2.73145,2.66406,-0.301549},{0.523926,2.81567,-1.01155},{-4.8208,2.87158,-0.701549},{-3.87061,-5.0415,-0.731549},{-4.73096,-5.00537,0.408451},{-2.1792,-5.02222,-0.351549},{-3.39795,-6.95508,-0.731549},{-3.58203,-7.24365,-0.731549},{-3.49756,-7.12695,0.408451},{-9.95215,-6.05859,0.348451},{13.4136,-5.93457,0.408451},{13.4463,-4.45898,0.028451},{13.4424,-6.20215,-0.351549},{2.93018,-8.67773,-0.351549},{1.53516,-6.79199,-0.351549},{7.16211,-5.12427,-0.351549},{6.79346,-5.11816,-0.73155},{2.87158,-6.91943,-0.73155},{0.0541992,-5.03271,-0.73155},{-1.979,-8.6875,-0.73155},{-5.84424,-5.04883,-0.73155},{-6.99268,-5.06836,-1.11155},{5.23535,-6.8335,-1.11155},{0.290039,-8.68701,-1.11155},{-0.649414,-8.68115,0.40845},{-0.983398,-9.56299,-1.21082}};
+	lootPos[] = {
+		//{-9.38843,-3.30176,-1.20142},{-3.77539,-3.86621,-1.20135},{1.31885,1.4668,-1.20142},{9.01367,3.84961,-1.20129},{13.3013,-1.77441,-1.20154},{9.81201,1.43066,-1.20142},{1.6499,5.14746,-1.20142},{0.753906,-3.69336,-1.20129},{13.3127,-7.64941,-1.2016},{11.1685,-3.7334,-1.20154},{8.89404,-8.37207,-1.20142},{-2.02612,-7.64844,-1.20142},{-7.97754,-5.78418,-1.20154},{-8.2251,-7.32227,-1.20148},{3.78979,-5.69238,-1.20142},{-9.38428,4.46094,-1.20142},{-3.57446,4.46777,-1.2016},{-3.33813,0.615234,-1.20154},{10.5925,-9.94238,-1.21088},{0.105713,-9.60449,-1.21088},{-4.85986,-10.4199,-1.21082},{-6.80884,-1.23926,-1.20148},{1.12256,-1.58691,-1.20148},
+		{11.8149,1.27979,-1.20155},{5.10449,1.61377,-1.20155},{1.70215,3.4292,-1.20155},{-0.771973,2.04102,-1.20155},{-3.59473,-6.04688,-1.20155},{-2.38428,-5.82202,-1.20155},{10.5171,-6.46729,-1.20155},{12.8472,-4.97754,-1.20155},{8.63623,-3.65381,-1.20155},{-3.22852,-10.0454,-1.21081}
+	};
+	lootPosSmall[] = {
+		{11.0537,-0.321289,-0.661549},{11.0303,2.8833,0.0484514},{10.6646,1.86377,-0.651548},{6.66162,-2.69971,-0.611548},{6.02979,-2.6416,-0.611548},{2.16553,-2.68262,-0.611548},{-1.36963,-2.75684,-0.611548},{-0.919434,-0.283936,-0.301549},{0.583008,-0.308594,-1.01155},{0.804199,3.0752,-0.311549},{4.90234,3.04053,0.0484514},{-5.73779,0.694824,-0.20155},{0.796875,0.0898438,-0.301549},{2.73145,2.66406,-0.301549},{0.523926,2.81567,-1.01155},{-4.8208,2.87158,-0.701549},{-3.87061,-5.0415,-0.731549},{-4.73096,-5.00537,0.408451},{-2.1792,-5.02222,-0.351549},{-3.39795,-6.95508,-0.731549},{-3.58203,-7.24365,-0.731549},{-3.49756,-7.12695,0.408451},{-9.95215,-6.05859,0.348451},{13.4136,-5.93457,0.408451},{13.4463,-4.45898,0.028451},{13.4424,-6.20215,-0.351549},{2.93018,-8.67773,-0.351549},{1.53516,-6.79199,-0.351549},{7.16211,-5.12427,-0.351549},{6.79346,-5.11816,-0.73155},{2.87158,-6.91943,-0.73155},{0.0541992,-5.03271,-0.73155},{-1.979,-8.6875,-0.73155},{-5.84424,-5.04883,-0.73155},{-6.99268,-5.06836,-1.11155},{5.23535,-6.8335,-1.11155},{0.290039,-8.68701,-1.11155},{-0.649414,-8.68115,0.40845},{-0.983398,-9.56299,-1.21082}
+	};
 };

 //DZE ADDED BELOW
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
@@ -8,7 +8,7 @@
 #include "Groups\Buildings\Industrial.hpp"
 #include "Groups\Buildings\Military.hpp"
 #include "Groups\Buildings\Office.hpp"
-#include "Groups\Buildings\Powerlines.hpp"
+//#include "Groups\Buildings\Powerlines.hpp"
 #include "Groups\Buildings\Residential.hpp"
 #include "Groups\Buildings\ResidentialRuins.hpp"
 #include "Groups\Buildings\Supermarket.hpp"
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
@@ -11,7 +11,7 @@
 #include "Buildings\InfectedCamp.hpp"
 #include "Buildings\Military.hpp"
 #include "Buildings\Office.hpp"
-#include "Buildings\Powerlines.hpp"
+//#include "Buildings\Powerlines.hpp"
 #include "Buildings\ResidentialRuins.hpp"
 #include "Buildings\Supermarket.hpp"
 #include "Buildings\Toilet.hpp"
--- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
@@ -5,7 +5,7 @@ class CfgLoot
 	class Groups
 	{
 		//Not renamed yet
-		#define DZ_BP_VestPouch DZ_Czech_Vest_Puch
+		#define DZ_BP_VestPouch DZ_Czech_Vest_Pouch
 		#define DZ_BP_Patrol DZ_Patrol_Pack_EP1
 		#define DZ_BP_Assault DZ_Assault_Pack_EP1
 		#define DZ_BP_Survival DZ_TK_Assault_Pack_EP1
@@ -14,14 +14,14 @@ class CfgLoot
 		#define DZ_BP_Czech DZ_CivilBackpack_EP1
 		#define DZ_BP_Coyote DZ_Backpack_EP1

-		#define ItemBloodbagAPos bloodBagAPos
-		#define ItemBloodbagANeg bloodBagANeg
-		#define ItemBloodbagBPos bloodBagBPos
-		#define ItemBloodbagBNeg bloodBagBNeg
-		#define ItemBloodbagABPos bloodBagABPos
-		#define ItemBloodbagABNeg bloodBagABNeg
-		#define ItemBloodbagOPos bloodBagOPos
-		#define ItemBloodbagONeg bloodBagONeg
+		#define ItemBloodbagAPos bloodBagAPOS
+		#define ItemBloodbagANeg bloodBagANEG
+		#define ItemBloodbagBPos bloodBagBPOS
+		#define ItemBloodbagBNeg bloodBagBNEG
+		#define ItemBloodbagABPos bloodBagABPOS
+		#define ItemBloodbagABNeg bloodBagABNEG
+		#define ItemBloodbagOPos bloodBagOPOS
+		#define ItemBloodbagONeg bloodBagONEG
 		
 		#define ItemBloodTester bloodTester
 		#define ItemTransfusionKit transfusionKit
@@ -56,6 +56,9 @@ class CfgLoot
 		#include "Groups\Zombies\Police.hpp"
 		#include "Groups\Zombies\Military.hpp"
 		#include "Groups\Zombies\Worker.hpp" //DZE
+		#include "Groups\Zombies\Suit.hpp" //DZE
+		#include "Groups\Zombies\Doctor.hpp" //DZE
+		#include "Groups\Zombies\Pilot.hpp" //DZE
 		
 		#undef DZ_BP_VestPouch
 		#undef DZ_BP_Patrol
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
@@ -90,6 +90,11 @@ AmmoMilitaryLow[] =
 	{Loot_MAGAZINE,		3,		20Rnd_B_765x17_Ball},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	//Epoch 1.0.6
+	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_Pellets},
+	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_74Slug},
+//	{Loot_MAGAZINE,		3,		20Rnd_B_AA12_HE},
 	
 	//Handgrenades
 	{Loot_MAGAZINE,		5,		SmokeShell},
@@ -105,6 +110,11 @@ AmmoMilitaryHigh[] =
 	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_G36},
 	{Loot_MAGAZINE,		5,		100Rnd_556x45_BetaCMag},
+	//Epoch 1.0.6
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_Pellets},
+	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_74Slug},
+//	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_HE},
 	
 	//Battle rifles
 	{Loot_MAGAZINE,		5,		20Rnd_762x51_DMR},
@@ -234,6 +244,7 @@ AmmoEU[] =
 	
 	//Battle rifles
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
 	
 	//Machine guns
 	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
@@ -318,7 +329,9 @@ assaultrifleammo[] = {
 	{Loot_MAGAZINE,		8,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_StanagSD},
-	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL}
+	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL},
+	//Epoch 1.0.6
+	{Loot_MAGAZINE,		6,		20Rnd_762x51_B_SCAR}
 };
 machinegunammo[] = {
 	{Loot_MAGAZINE,		4,		100Rnd_556x45_BetaCMag},
@@ -337,4 +350,4 @@ machinegunammoexpl[] = {
 	{Loot_MAGAZINE,		4,		200Rnd_556x45_M249},
 	{Loot_MAGAZINE,		1,		MAAWS_HEAT},
 	{Loot_MAGAZINE,		2,		PipeBomb}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
@@ -49,6 +49,7 @@ AmmoBoxEU1[] =
 AmmoBoxEU2[] =
 {
 	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
 	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
 };

@@ -101,4 +102,4 @@ AmmoBoxUS4[] =
 	{Loot_MAGAZINE,		1,		SmokeShellRed},
 	{Loot_MAGAZINE,		1,		SmokeShellGreen},
 	{Loot_MAGAZINE,		0.3,	PipeBomb}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp
@@ -10,8 +10,7 @@ AttachmentsEast[] =
 {
 	{Loot_MAGAZINE,		2,		Attachment_Kobra},
 	{Loot_MAGAZINE,		1,		Attachment_PSO1},
-	{Loot_MAGAZINE,		3,		Attachment_SupMakarov},
-	{Loot_MAGAZINE,		2,		Attachment_SupBizon},
+	{Loot_MAGAZINE,		3,		Attachment_Sup9},
 	{Loot_MAGAZINE,		1,		Attachment_Sup545},
 	{Loot_MAGAZINE,		2,		Attachment_GP25},
 	{Loot_MAGAZINE,		2,		Attachment_Ghillie},
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Boat.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Boat.hpp
@@ -2,4 +2,10 @@ Boat[] =
 {
 	{Loot_WEAPON,		1,		ItemFishingPole},
 	{Loot_GROUP,		9,		Generic}
+};
+
+BoatSmall[] =
+{
+	{Loot_GROUP,		5,		GenericSmall},
+	{Loot_GROUP,		4,		Consumable}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
@@ -22,9 +22,9 @@ Castle[] =
 	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit},
 	{Loot_MAGAZINE,		3,		equip_rope},
 	{Loot_MAGAZINE,		4,		PartWoodPile},
-	{Loot_MAGAZINE,		1,		ItemPadlock},
+	{Loot_MAGAZINE,		2,		ItemComboLock},
 	{Loot_MAGAZINE,		1,		ItemTent},
-	{Loot_MAGAZINE,		1,		ItemCamoNet},
+	{Loot_MAGAZINE,		1,		forest_net_kit},

 	//Groups
 	{Loot_GROUP,		5,		AmmoCivilian},
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp
@@ -22,4 +22,17 @@ Church[] =
 	{Loot_GROUP,		4,		Generic},
 	{Loot_WEAPON,		3,		ItemMatchbox},
 	{Loot_GROUP,		8,		Consumable}
+};
+
+ChurchSmall[] =
+{
+	//Tools
+	{Loot_WEAPON,		3,		ItemCompass},
+	{Loot_WEAPON,		3,		ItemMatchbox},
+	{Loot_GROUP,		3,		pistols},
+	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		5,		AmmoCivilian},
+	{Loot_GROUP,		2,		AttachmentsGeneric},
+	{Loot_GROUP,		4,		GenericSmall},
+	{Loot_GROUP,		8,		Consumable}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp
@@ -1,13 +1,13 @@
 Construction[] =
 {
-	{Loot_MAGAZINE,		9,		ItemLog},
+	{Loot_MAGAZINE,		9,		ItemLog}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		9,		ItemPlank},
-	{Loot_MAGAZINE,		5,		ItemStone},
+	{Loot_MAGAZINE,		5,		ItemStone}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		8,		equip_nails},
-	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
+	//{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
 	{Loot_MAGAZINE,		9,		equip_metal_sheet},
 	{Loot_MAGAZINE,		1,		equip_lever},
-	{Loot_MAGAZINE,		1,		ItemPadlock},
+	{Loot_MAGAZINE,		1,		ItemComboLock},
 	
 	{Loot_WEAPON,		1,		ItemPickaxe},
 	{Loot_WEAPON,		2,		ItemPickaxeBroken},
@@ -26,7 +26,7 @@ Construction[] =
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
 	{Loot_MAGAZINE,		2,		equip_hose},
 //	{Loot_MAGAZINE,		3,		ItemScrews},
-	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
+//	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
 	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
 	{Loot_MAGAZINE,		1,		MortarBucket},
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp
@@ -34,4 +34,19 @@ Farm[] =
 	{Loot_GROUP,		8,		Consumable},
 	{Loot_WEAPON,		3,		ItemMatchbox},
 	{Loot_GROUP,		8,		Generic}
+};
+
+FarmSmall[] =
+{
+	{Loot_GROUP,		10,		pistols},
+	{Loot_WEAPON,		5,		ItemKnife},
+	{Loot_MAGAZINE,		3,		equip_duct_tape},
+	{Loot_MAGAZINE,		6,		equip_nails},
+	{Loot_MAGAZINE,		4,		equip_string},
+	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		15,		AmmoCivilian},
+	{Loot_GROUP,		3,		AttachmentsGeneric},
+	{Loot_GROUP,		8,		Consumable},
+	{Loot_WEAPON,		3,		ItemMatchbox},
+	{Loot_GROUP,		8,		GenericSmall}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp
@@ -1,18 +1,45 @@
 Hangar[] =
 {
-	{Loot_GROUP,		10,		MilitarySpecial},
+	{Loot_GROUP,		8,		MilitarySpecial},
 	//Tools
-	{Loot_WEAPON,		2,		ItemEtool},
+	{Loot_WEAPON,		4,		ItemEtool},
 	
 	//Items
 	{Loot_MAGAZINE,		2,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemSandbag},
-	{Loot_MAGAZINE,		2,		ItemWire},
-	{Loot_MAGAZINE,		2,		ItemTankTrap},
+	{Loot_MAGAZINE,		1,		PartEngine},
+	{Loot_MAGAZINE,		4,		PartGeneric},
+	{Loot_MAGAZINE,		3,		PartGlass},
+	{Loot_MAGAZINE,		3,		ItemSandbag},
+	{Loot_MAGAZINE,		3,		ItemWire},
+	{Loot_MAGAZINE,		3,		ItemTankTrap},
 	
 	//Groups
-	{Loot_GROUP,		20,		Trash},
-	{Loot_GROUP,		20,		Consumable},
-	{Loot_GROUP,		10,		Generic},
-	{Loot_GROUP,		5,		AttachmentsGeneric}
-};
+	{Loot_PILE,			6,		Trash, 1, 2},
+	{Loot_PILE,			3,		Consumable, 1, 2},
+	{Loot_GROUP,		6,		Generic},
+	{Loot_GROUP,		3,		AttachmentsGeneric}
+};
+
+HangarSmall[] =
+{
+	{Loot_TOOL,			2,		Binocular},	
+	{Loot_WEAPON,		2,		NVGoggles},
+	{Loot_GROUP,		8,		pistols},
+	{Loot_TOOL,			2,		Binocular_Vector},
+	{Loot_TOOL,			3,		ItemKnife},
+	{Loot_TOOL,			1.3,	ItemGPS},
+	{Loot_TOOL,			3,		ItemMap},
+	{Loot_GROUP,		3,		militaryclothes},
+	{Loot_GROUP,		2,		specialclothes},
+	{Loot_MAGAZINE,		0.5,	PipeBomb},
+	{Loot_MAGAZINE,		0.5,	MAAWS_HEAT},
+	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
+	{Loot_GROUP,		8,		AmmoMilitaryLow},
+	{Loot_GROUP,		8,		AmmoMilitaryHigh},
+	{Loot_GROUP,		8,		AttachmentsEast},
+	{Loot_GROUP,		6,		AttachmentsWest},
+	{Loot_GROUP,		8,		MedicalLow},
+	{Loot_GROUP,		8,		Trash},
+	{Loot_GROUP,		8,		Consumable},
+	{Loot_GROUP,		8,		GenericSmall}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hospital.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hospital.hpp
@@ -9,4 +9,20 @@ Hospital[] =
 	{Loot_CONTAINER,	1,		DZ_MedBox, MedicalBox, 8, 16},
 	
 	{Loot_PILE,			10,		Trash, 1, 2}
+};
+
+HospitalSmall[] =
+{
+	{Loot_MAGAZINE,		2,		equip_gauze},
+	{Loot_MAGAZINE,		2,		equip_gauzepackaged},	
+	{Loot_MAGAZINE,		8,		ItemBandage},
+	{Loot_MAGAZINE,		5,		ItemPainkiller},
+	{Loot_MAGAZINE,		4,		ItemMorphine},
+	{Loot_MAGAZINE,		3,		ItemEpinephrine},
+	{Loot_MAGAZINE,		4,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		4,		ItemHeatPack},
+	{Loot_MAGAZINE,		3,		ItemBloodTester},
+	{Loot_MAGAZINE,		2,		ItemBloodbagEmpty},
+	{Loot_GROUP,		2,		Antibiotics},
+	{Loot_GROUP,		6,		Bloodbags}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
@@ -20,8 +20,8 @@ Hunting[] =
 	{Loot_MAGAZINE,		2,		FoodNutmix},
 	{Loot_MAGAZINE,		1,		ItemDocument},
 	{Loot_MAGAZINE,		1,		ItemMixOil},
-	//{Loot_WEAPON,		1,		RedRyder},
-	//{Loot_MAGAZINE,	1,		350Rnd_BB_Magazine},
+	{Loot_WEAPON,		1,		RedRyder},
+	{Loot_MAGAZINE,		1,		350Rnd_BB_Magazine},
 	
 	//Backpacks
 	{Loot_GROUP,		5,		backpacks},
@@ -32,8 +32,8 @@ Hunting[] =
 	{Loot_MAGAZINE,		2,		ItemBandage},
 	{Loot_MAGAZINE,		1,		ItemDomeTent},
 	{Loot_MAGAZINE,		3,		TrapBear},
-	{Loot_MAGAZINE,		1,		12Rnd_Quiver_Wood},
-	{Loot_MAGAZINE,		1,		1Rnd_Bolt_Tranquilizer},
+	{Loot_MAGAZINE,		3,		12Rnd_Quiver_Wood},
+	{Loot_MAGAZINE,		2,		1Rnd_Bolt_Tranquilizer},
 	{Loot_MAGAZINE,		1,		1Rnd_Bolt_Explosive},
 	
 	{Loot_PILE,			10,		AmmoCivilian, 1, 3},
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
@@ -3,7 +3,6 @@ Industrial[] =
 	//Tools
 	{Loot_WEAPON,		3,		ItemKnife},
 	{Loot_WEAPON,		6,		ItemToolbox},
-	{Loot_WEAPON,		2,		ItemFlashlight},
 //	{Loot_WEAPON,		8,		ItemCrowbar},
 	{Loot_VEHICLE,		8,		WeaponHolder_ItemCrowbar},
 //	{Loot_WEAPON,		5,		ItemHatchet},
@@ -16,30 +15,40 @@ Industrial[] =
 	{Loot_WEAPON,		1,		ItemKeyKit},
 	
 	//Items
-	{Loot_MAGAZINE,		6,		ItemSandbag},
+//	{Loot_MAGAZINE,		6,		ItemSandbag},
 	{Loot_MAGAZINE,		4,		ItemJerryCan},
-	{Loot_MAGAZINE,		1,		ItemWire},
-	{Loot_MAGAZINE,		4,		ItemTankTrap},
+//	{Loot_MAGAZINE,		1,		ItemWire},
+//	{Loot_MAGAZINE,		4,		ItemTankTrap},
 	{Loot_MAGAZINE,		1,		equip_brick},
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
 	{Loot_MAGAZINE,		2,		equip_hose},
 	{Loot_MAGAZINE,		6,		equip_nails},
 //	{Loot_MAGAZINE,		3,		ItemScrews},
-	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
+//	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
 	{Loot_MAGAZINE,		2,		equip_metal_sheet},
 	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
-	{Loot_MAGAZINE,		12,		ItemPlank},
-	{Loot_MAGAZINE,		1,		MortarBucket},
-	{Loot_MAGAZINE,		2,		CinderBlocks},
+	{Loot_MAGAZINE,		8,		ItemPlank},
+	{Loot_MAGAZINE,		2,		MortarBucket},
+	{Loot_MAGAZINE,		3,		CinderBlocks},
 	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
 	//Other
 	{Loot_GROUP,		15,		Parts},
-	{Loot_GROUP,		7,		Military},
 	{Loot_PILE,			10,		Trash, 1, 3},
-	{Loot_PILE,			4,		Consumable, 1, 2},
-	{Loot_GROUP,		8,		Generic}
-};
+	{Loot_PILE,			3,		Consumable, 1, 2},
+	{Loot_GROUP,		5,		Generic}
+};
+
+IndustrialSmall[] =
+{
+	{Loot_WEAPON,		3,		ItemKnife},
+	{Loot_WEAPON,		1,		ItemKeyKit},
+	{Loot_MAGAZINE,		2,		equip_duct_tape},
+	{Loot_MAGAZINE,		6,		equip_nails},
+	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		3,		Consumable},
+	{Loot_GROUP,		5,		GenericSmall}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
@@ -11,12 +11,12 @@ Military[] =
 	{Loot_GROUP,		4,		machineguns},
 	
 	//Tools
-	{Loot_TOOL,			3,		Binocular},
-	{Loot_TOOL,			4,		ItemFlashlightRed},
-	{Loot_TOOL,			4,		ItemKnife},
-	{Loot_TOOL,			0.5,	ItemGPS},
-	{Loot_TOOL,			3,		ItemMap},
-	{Loot_TOOL,			3,		ItemEtool},
+	{Loot_TOOL,		3,		Binocular},
+	{Loot_TOOL,		4,		ItemFlashlightRed},
+	{Loot_TOOL,		3.5,	ItemKnife},
+	{Loot_TOOL,		0.5,	ItemGPS},
+	{Loot_TOOL,		3,		ItemMap},
+	{Loot_TOOL,		3,		ItemEtool},
 	
 	//Backpacks
 	{Loot_GROUP,		6,		backpacks},
@@ -28,26 +28,45 @@ Military[] =
 	{Loot_GROUP,		1,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
-	{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
-	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
-	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	1.1,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
+	{Loot_CONTAINER,	0.5,		DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
+	{Loot_CONTAINER,	0.2,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
+	{Loot_CONTAINER,	1.2,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
+	{Loot_CONTAINER,	0.8,			DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
+	{Loot_CONTAINER,	1.2,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
+	{Loot_CONTAINER,	0.8,			DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
+//	{Loot_CONTAINER,	2,			DZ_MedBox, MedicalBox, 10, 20},
 	
 	//Other
 	{Loot_MAGAZINE,		5,		FoodMRE},
-	{Loot_MAGAZINE,		5,		ItemSandbag},
+//	{Loot_MAGAZINE,		4,		ItemSandbag},
 	{Loot_PILE,			15,		AmmoMilitaryLow, 1, 3},
 	{Loot_GROUP,		4,		AmmoMilitaryHigh},
 	{Loot_GROUP,		4,		AttachmentsGeneric},
 	{Loot_GROUP,		8,		AttachmentsEast},
 	{Loot_PILE,			10,		MedicalLow, 1, 2},
 	{Loot_PILE,			15,		Trash, 1, 2},
-	{Loot_PILE,			10,		Consumable, 1, 2},
-	{Loot_GROUP,		10,		Generic}
+	{Loot_PILE,			10,		Consumable, 1, 2}
+//	{Loot_GROUP,		10,		Generic}
+};
+
+MilitarySmall[] =
+{
+	{Loot_GROUP,		10,		pistols},
+	{Loot_TOOL,			2,		Binocular},
+	{Loot_TOOL,			0.5,	ItemGPS},
+	{Loot_TOOL,			3,		ItemMap},
+	{Loot_TOOL,			3,		ItemKnife},
+	{Loot_GROUP,		2,		militaryclothes},
+	{Loot_GROUP,		2,		specialclothes},
+	{Loot_GROUP,		15,		AmmoMilitaryLow},
+	{Loot_GROUP,		4,		AmmoMilitaryHigh},
+	{Loot_GROUP,		4,		AttachmentsGeneric},
+	{Loot_GROUP,		8,		AttachmentsEast},
+	{Loot_GROUP,		10,		MedicalLow},
+	{Loot_GROUP,		15,		Trash},
+	{Loot_GROUP,		10,		Consumable}
+//	{Loot_GROUP,		10,		GenericSmall}
 };

 MilitarySpecial[] =
@@ -59,14 +78,15 @@ MilitarySpecial[] =
 	{Loot_GROUP,		12,		submachinegun},
 	{Loot_GROUP,		13,		assaultrifles},
 	{Loot_GROUP,		9,		machineguns},
+	
 	//Tools
-	{Loot_TOOL,			4,		Binocular},
-	{Loot_TOOL,			2,		Binocular_Vector},
-	{Loot_TOOL,			3,		ItemFlashlightRed},
-	{Loot_TOOL,			5,		ItemKnife},
-	{Loot_TOOL,			1.3,	ItemGPS},
-	{Loot_TOOL,			4,		ItemMap},
-	{Loot_TOOL,			2,		ItemEtool},
+	{Loot_TOOL,		3,		Binocular},
+	{Loot_TOOL,		2,		Binocular_Vector},
+	{Loot_TOOL,		3,		ItemFlashlightRed},
+	{Loot_TOOL,		4,		ItemKnife},
+	{Loot_TOOL,		1.3,	ItemGPS},
+	{Loot_TOOL,		4,		ItemMap},
+	{Loot_TOOL,		2,		ItemEtool},
 	
 	//Backpacks
 	{Loot_GROUP,		9,		militarybackpacks},
@@ -77,17 +97,17 @@ MilitarySpecial[] =
 	{Loot_GROUP,		2,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},	//5.45x39
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14},	//5.56x45
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
-	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5},	//7.62x54R
-//	{Loot_CONTAINER,	0.5,	DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7},	//7.62x54R
-	{Loot_CONTAINER,	0.5,	DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
-	{Loot_CONTAINER,	0.5,	DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
+	{Loot_CONTAINER,	2.2,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},	//5.45x39
+	{Loot_CONTAINER,	1.8,			DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14},	//5.56x45
+	{Loot_CONTAINER,	1.8,			DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
+	{Loot_CONTAINER,	0.8,			DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5},	//7.62x54R
+//	{Loot_CONTAINER,	0.5,		DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7},	//7.62x54R
+	{Loot_CONTAINER,	0.2,		DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
+	{Loot_CONTAINER,	0.2,		DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7},	//Grenades

 	//Other
 	{Loot_MAGAZINE,		3,		FoodMRE},
-	{Loot_MAGAZINE,		2,		ItemSandbag},
+//	{Loot_MAGAZINE,		2,		ItemSandbag},
 	{Loot_MAGAZINE,		0.5,	PipeBomb},
 	{Loot_MAGAZINE,		0.5,	MAAWS_HEAT},
 	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
@@ -98,15 +118,50 @@ MilitarySpecial[] =
 	{Loot_GROUP,		6,		AttachmentsWest},
 	{Loot_PILE,			10,		MedicalLow, 1, 2},
 	{Loot_PILE,			10,		Trash, 1, 2},
-	{Loot_PILE,			10,		Consumable, 1, 2},
-	{Loot_GROUP,		8,		Generic}
+	{Loot_PILE,			10,		Consumable, 1, 2}
+//	{Loot_GROUP,		8,		Generic}
+};
+
+MilitarySpecialSmall[] =
+{
+	{Loot_WEAPON,		2,		NVGoggles},
+	{Loot_GROUP,		10,		pistols},
+	{Loot_TOOL,			3,		Binocular},
+	{Loot_TOOL,			2,		Binocular_Vector},
+	{Loot_TOOL,			3,		ItemKnife},
+	{Loot_TOOL,			1.3,	ItemGPS},
+	{Loot_TOOL,			3,		ItemMap},
+	{Loot_GROUP,		3,		militaryclothes},
+	{Loot_GROUP,		2,		specialclothes},
+	{Loot_MAGAZINE,		0.5,	PipeBomb},
+	{Loot_MAGAZINE,		0.5,	MAAWS_HEAT},
+	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
+	{Loot_GROUP,		15,		AmmoMilitaryLow},
+	{Loot_GROUP,		10,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		AttachmentsGeneric},
+	{Loot_GROUP,		8,		AttachmentsEast},
+	{Loot_GROUP,		6,		AttachmentsWest},
+	{Loot_GROUP,		10,		MedicalLow},
+	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		10,		Consumable}
+//	{Loot_GROUP,		8,		GenericSmall}
 };

 MilitaryIndustrial[] = {//DZE ADDED
-	{Loot_GROUP,				15,		Parts},
-	{Loot_MAGAZINE,				5,		FoodMRE},
-	{Loot_MAGAZINE,				3,		ItemFuelBarrelEmpty},
-	{Loot_MAGAZINE,				2,		ItemGenerator},
-	{Loot_MAGAZINE,				2,		fuel_pump_kit},
-	{Loot_GROUP, 				15, 	Military}
-};
+	{Loot_GROUP,		15,		Parts},
+	{Loot_MAGAZINE,		5,		FoodMRE},
+	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
+	{Loot_MAGAZINE,		2,		ItemGenerator},
+	{Loot_MAGAZINE,		2,		fuel_pump_kit},
+	{Loot_MAGAZINE,		3,		ItemWire},
+	{Loot_MAGAZINE,		3,		ItemTankTrap},
+	{Loot_MAGAZINE,		6,		ItemSandbag},
+	{Loot_MAGAZINE,		1,		PartEngine},
+	{Loot_GROUP, 		15, 	Military},
+	{Loot_GROUP,		4,		Generic}
+};
+
+MilitaryIndustrialSmall[] = {
+	{Loot_GROUP, 		15, 	MilitarySmall},
+	{Loot_GROUP,		8,		GenericSmall}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp
@@ -40,4 +40,25 @@ Office[] =
 	{Loot_GROUP,		8,		Generic},
 	{Loot_GROUP,		10,		AmmoCivilian},
 	{Loot_GROUP,		5,		AttachmentsGeneric}
+};
+
+OfficeSmall[] =
+{
+	{Loot_WEAPON,		3,		ItemWatch},
+	{Loot_WEAPON,		6,		ItemMap},
+	{Loot_WEAPON,		6,		ItemCompass},
+	{Loot_WEAPON,		6,		ItemKnife},
+	{Loot_WEAPON,		4,		ItemMatchbox},
+	{Loot_WEAPON,		4,		Binocular},
+	{Loot_GROUP,		10,		pistols},
+	{Loot_GROUP,		4,		MilitarySmall},
+	{Loot_GROUP,		3,		clothes},
+	{Loot_GROUP,		2,		specialclothes},
+	{Loot_MAGAZINE,		5,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		5,		ItemPainkiller},
+	{Loot_GROUP,		8,		Consumable},
+	{Loot_GROUP,		6,		Trash},
+	{Loot_GROUP,		8,		GenericSmall},
+	{Loot_GROUP,		10,		AmmoCivilian},
+	{Loot_GROUP,		5,		AttachmentsGeneric}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
@@ -4,7 +4,7 @@ Residential[] =
 	{Loot_WEAPON,		6,		MeleeBaseBallBat},
 	
 	//Weapon Groups
-	{Loot_GROUP,		3,		Military},
+//	{Loot_GROUP,		3,		Military},
 	{Loot_GROUP,		8,		pistols},
 	{Loot_GROUP,		6,		shotgunsingleshot},
 	
@@ -15,17 +15,14 @@ Residential[] =
 	{Loot_WEAPON,		6,		ItemFlashlight},
 	{Loot_WEAPON,		5,		ItemKnife},
 //	{Loot_WEAPON,		3,		ItemShovel},
-	{Loot_WEAPON,		1,		ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
-	{Loot_WEAPON,		1,		ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
+//	{Loot_WEAPON,		1,		ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
+//	{Loot_WEAPON,		1,		ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
 	{Loot_WEAPON,		1,		Binocular},
 	
 	//Backpacks
 	{Loot_GROUP,		4,		backpacks},
 	
-	//Other
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
 	{Loot_MAGAZINE,		1,		PartPlywoodPack},
-	
 	{Loot_PILE,			6,		AmmoCivilian, 1, 2},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			10,		Consumable, 1, 2},
@@ -35,4 +32,23 @@ Residential[] =
 	{Loot_GROUP,		3,		tents},
 	{Loot_WEAPON,		3,		ItemMatchbox},
 	{Loot_GROUP,		8,		Generic}
-};
+};
+
+ResidentialSmall[] =
+{
+	{Loot_GROUP,		8,		pistols},
+	{Loot_WEAPON,		3,		ItemMap},
+	{Loot_WEAPON,		5,		ItemWatch},
+	{Loot_WEAPON,		5,		ItemCompass},
+	{Loot_WEAPON,		5,		ItemKnife},
+	{Loot_WEAPON,		1,		Binocular},
+	{Loot_MAGAZINE,		0.5,	ItemComboLock},
+	{Loot_GROUP,		6,		AmmoCivilian},
+	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		10,		Consumable},
+	{Loot_GROUP,		4,		AttachmentsGeneric},
+	{Loot_GROUP,		5,		clothes},
+	{Loot_GROUP,		3,		specialclothes},
+	{Loot_WEAPON,		3,		ItemMatchbox},
+	{Loot_GROUP,		8,		GenericSmall}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp
@@ -1,8 +1,8 @@
 ResidentialRuins[] =
 {
-	{Loot_MAGAZINE,		10,		ItemLog},
-	{Loot_MAGAZINE,		10,		ItemStone},
-	{Loot_MAGAZINE,		7,		equip_metal_sheet_rusted},
+	{Loot_MAGAZINE,		10,		ItemLog}, // Used for crafting and vanilla buildables
+	{Loot_MAGAZINE,		10,		ItemStone}, // Used for crafting and vanilla buildables
+//	{Loot_MAGAZINE,		7,		equip_metal_sheet_rusted},
 	{Loot_GROUP,		4,		Trash},
 	{Loot_GROUP,		3,		AttachmentsGeneric}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp
@@ -7,8 +7,8 @@ Supermarket[] =
 	{Loot_WEAPON,		5,		ItemFlashlight},
 	{Loot_WEAPON,		2,		ItemKnife},
 	{Loot_WEAPON,		3,		Binocular},
-	{Loot_WEAPON,		2,		ItemDIY_wood},
-	{Loot_WEAPON,		1,		ItemDIY_Gate},
+//	{Loot_WEAPON,		2,		ItemDIY_wood},
+//	{Loot_WEAPON,		1,		ItemDIY_Gate},
 	
 	//Pistols
 	{Loot_GROUP,		10,		pistols},
@@ -28,8 +28,8 @@ Supermarket[] =
 	{Loot_MAGAZINE,		1,		ItemMixOil},
 	{Loot_MAGAZINE,		1,		PartPlywoodPack},
 	//{Loot_MAGAZINE,	0.5,	ItemDomeTent}, //IN TENTS GROUP
-	{Loot_MAGAZINE,		1,		ItemCamoNet},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		1,		forest_net_kit},
+	{Loot_MAGAZINE,		0.1,	ItemComboLock},
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
@@ -44,4 +44,27 @@ Supermarket[] =
 	{Loot_WEAPON,		3,		ItemMatchbox},
 //	{Loot_GROUP,		3,		MedicalLow},
 	{Loot_GROUP,		10,		Trash}
+};
+
+SupermarketSmall[] =
+{
+	{Loot_WEAPON,		5,		ItemWatch},
+	{Loot_WEAPON,		1,		ItemCompass},
+	{Loot_WEAPON,		6,		ItemMap},
+	{Loot_WEAPON,		2,		ItemKnife},
+	{Loot_WEAPON,		3,		Binocular},
+	{Loot_GROUP,		10,		pistols},
+	{Loot_MAGAZINE,		1,		ItemMixOil},
+	{Loot_MAGAZINE,		0.1,	ItemComboLock},
+	{Loot_MAGAZINE,		3,		ItemBandage},
+	{Loot_MAGAZINE,		2,		ItemPainkiller},
+	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		5,		equip_nails},
+	{Loot_GROUP,		40,		Consumable},
+	{Loot_GROUP,		20,		GenericSmall},
+	{Loot_GROUP,		10,		AmmoCivilian},
+	{Loot_GROUP,		3,		AttachmentsGeneric},
+	{Loot_WEAPON,		3,		ItemMatchbox},
+	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		3,		MedicalLow}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp
@@ -11,7 +11,17 @@ clothes[] = {
 	{Loot_MAGAZINE,	2,	Skin_SurvivorWpink_DZ},
 	{Loot_MAGAZINE,	2,	Skin_SurvivorWurban_DZ},
 	{Loot_MAGAZINE,	1,	Skin_INS_Bardak_DZ},
-	{Loot_MAGAZINE,	1,	Skin_INS_Worker2_DZ}
+	{Loot_MAGAZINE,	1,	Skin_INS_Worker2_DZ},
+	{Loot_MAGAZINE,	2,	Skin_INS_Lopotev_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Doctor_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Assistant_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Worker1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Worker3_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Worker4_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani01_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani03_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani04_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani06_EP1_DZ}
 };
 militaryclothes[] = {
 	{Loot_MAGAZINE,	3,	Skin_Camo1_DZ},
@@ -28,7 +38,21 @@ militaryclothes[] = {
 	{Loot_MAGAZINE,	1,	Skin_CZ_Soldier_Sniper_EP1_DZ},
 	{Loot_MAGAZINE,	3,	Skin_Graves_Light_DZ},
 	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_AR_DZ},
-	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_CO_DZ}
+	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_CO_DZ},
+	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_Officer_DZ},
+	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_MG_DZ},
+	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_Pilot_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_TL_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_R_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_Sapper_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_Marksman_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_Assault_R_DZ},
+	{Loot_MAGAZINE,	2,	Skin_US_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_UN_CDF_Soldier_Guard_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_UN_CDF_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_GER_Soldier_TL_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_BAF_Soldier_Officer_MTP_DZ},
+	{Loot_MAGAZINE,	2,	Skin_BAF_Soldier_N_MTP_DZ}
 };
 specialclothes[] = {
 	{Loot_MAGAZINE,	3,	Skin_Ins_Soldier_GL_DZ},
@@ -48,7 +72,18 @@ specialclothes[] = {
 	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_2_DZ},
 	{Loot_MAGAZINE,	1,	Skin_TK_Special_Forces_MG_EP1_DZ},
 	{Loot_MAGAZINE,	1,	Skin_TK_Soldier_Sniper_EP1_DZ},
-	{Loot_MAGAZINE,	1,	Skin_TK_Commander_EP1_DZ},
-	{Loot_MAGAZINE,	1,	Skin_RU_Soldier_Crew_DZ},
-	{Loot_MAGAZINE,	1,	Skin_INS_Lopotev_DZ}
+	{Loot_MAGAZINE,	2,	Skin_TK_Commander_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_INS_Soldier_AR_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_GUE_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_CZ_Soldier_SL_DES_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_Officer_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RUS_Soldier1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RUS_Commander_DZ},
+	{Loot_MAGAZINE,	2,	Skin_MVD_Soldier_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Ins_Soldier_2_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Ins_Commander_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Ins_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	2,	Skin_CDF_Soldier_DZ}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
@@ -5,7 +5,7 @@ Consumable[] =
 	{Loot_MAGAZINE,		3,		ItemPainkiller},
 	{Loot_MAGAZINE,		3,		ItemAntibacterialWipe},*/
 	
-	{Loot_MAGAZINE,		3,		ItemWaterBottleUnfilled},
+	{Loot_MAGAZINE,		3,		ItemWaterBottleUnfilled}, //TODO: replace with canteen to better fit Epoch lootPosSmall
 	{Loot_MAGAZINE,		3,		ItemWaterBottleSafe},
 	{Loot_MAGAZINE,		3,		ItemWaterBottle},
 	{Loot_MAGAZINE,		3,		ItemHeatPack},
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
@@ -34,14 +34,14 @@ CrashSiteRU[] =
 	{Loot_GROUP,		2,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_MedBox, MedicalBox, 10, 20},
 	//{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
 	//{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
 	//{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		forest_large_net_kit},
 	{Loot_GROUP,		7,		AttachmentsEast},
 	{Loot_GROUP,		3,		AttachmentsWest},
 	
@@ -100,7 +100,7 @@ CrashSiteUS[] =
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		forest_large_net_kit},
 	{Loot_GROUP,		10,		AttachmentsWest},
 	
 	//Piles
@@ -158,7 +158,7 @@ CrashSiteEU[] =
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		desert_net_kit},
 	{Loot_GROUP,		10,		AttachmentsWest},
 	
 	//Piles
@@ -217,7 +217,7 @@ CrashSiteUN[] =
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		desert_large_net_kit},
 	{Loot_GROUP,		3,		AttachmentsEast},
 	{Loot_GROUP,		3,		AttachmentsWest},
 	
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
@@ -10,6 +10,11 @@ Generic[] =
 	//DZE
 	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
 	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		2,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		2,		6Rnd_45ACP},
 	
 //	{Loot_MAGAZINE,		1,		ItemBookBible},
 	
@@ -18,7 +23,7 @@ Generic[] =
 	{Loot_MAGAZINE,		1,		equip_duct_tape},
 	{Loot_MAGAZINE,		1,		equip_rope},
 	{Loot_MAGAZINE,		1,		equip_herb_box},
-	{Loot_MAGAZINE,		1,		equip_pvc_box},
+//	{Loot_MAGAZINE,		1,		equip_pvc_box},
 	{Loot_MAGAZINE,		1,		equip_lever},
 	{Loot_MAGAZINE,		1,		equip_rag},
 	{Loot_MAGAZINE,		1,		equip_nails},
@@ -30,4 +35,23 @@ tents[] = {
 	{Loot_MAGAZINE,		0.5,	ItemDomeTent},
 	{Loot_MAGAZINE,		1,		ItemTent},
 	{Loot_MAGAZINE,		0.5,	ItemDesertTent} //EPOCH ADDITION
-};
+};
+
+GenericSmall[] =
+{	
+	{Loot_MAGAZINE,		1,		HandRoadFlare},
+	{Loot_MAGAZINE,		1,		HandChemGreen},
+	{Loot_MAGAZINE,		1,		HandChemBlue},
+	{Loot_MAGAZINE,		1,		HandChemRed},
+	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
+	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		1,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		1,		6Rnd_45ACP},
+	{Loot_MAGAZINE,		1,		equip_string},
+	{Loot_MAGAZINE,		1,		equip_duct_tape},
+	{Loot_MAGAZINE,		1,		equip_rope},
+	{Loot_MAGAZINE,		1,		equip_nails}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp
@@ -52,6 +52,6 @@ Bloodbags[] =
 	{Loot_MAGAZINE,		2,		ItemBloodbagABPos},
 	{Loot_MAGAZINE,		2,		ItemBloodbagABNeg},
 	
-	{Loot_MAGAZINE,		3,		ItemBloodbagOPos},
-	{Loot_MAGAZINE,		2,		ItemBloodbagONeg}
+	{Loot_MAGAZINE,		2,		ItemBloodbagOPos},
+	{Loot_MAGAZINE,		1,		ItemBloodbagONeg}
 };
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -22,7 +22,7 @@ shotgunsingleshot[] = {
 	{Loot_WEAPON,		1,		Saiga12K},
 	{Loot_WEAPON,		1,		Remington870_DZ}, //Remington870_lamp
 	{Loot_WEAPON,		1,		Crossbow_DZ},
-	//{Loot_WEAPON,		1,		RedRyder},
+	{Loot_WEAPON,		1,		RedRyder},
 	{Loot_WEAPON,		1,		M1014_DZ} //M1014
 };
 Chainsaws[] = {
@@ -36,7 +36,7 @@ farmweapons[] = {
 	{Loot_GROUP,		5,		shotgunsingleshot},
 	{Loot_WEAPON,		2,		CZ550_DZ}, //huntingrifle
 	{Loot_GROUP,		0.3,	Chainsaws},
-	//{Loot_WEAPON,		2,		RedRyder},
+	{Loot_WEAPON,		2,		RedRyder},
 	{Loot_WEAPON,		3,		Mosin_DZ}
 };
 sniperrifles[] = {
@@ -55,7 +55,10 @@ sniperrifles[] = {
 	{Loot_WEAPON,		0.5,	VSS_vintorez},
 	{Loot_WEAPON,		0.6,	SCAR_H_LNG_Sniper_SD},
 	{Loot_WEAPON,		1,		M14_DZ}, //M14_EP1
-	{Loot_WEAPON,		1,		DMR_DZ} //DMR
+	{Loot_WEAPON,		0.7,		DMR_DZ}, //DMR
+	//Epoch 1.0.6
+	{Loot_WEAPON,		0.8,	SCAR_H_LNG_Sniper}, //Mk17 Sniper
+	{Loot_WEAPON,		0.6,	M110_NVG_EP1} //M110 NVG
 };
 submachinegun[] = {
 	{Loot_WEAPON,		2,		PDW_DZ}, //UZI_EP1
@@ -76,30 +79,44 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.1,		FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable
 	{Loot_WEAPON,		0.5,		G36A_Camo_DZ}, //G36A_camo
 	{Loot_WEAPON,		0.5,		G36C_DZ}, //G36C
-	{Loot_WEAPON,		0.5,		G36C_camo},
+	{Loot_WEAPON,		0.4,		G36C_camo},
 	{Loot_WEAPON,		0.5,		G36K_Camo_DZ}, //G36K_camo
-	{Loot_WEAPON,		0.3,		G36_C_SD_camo},
+	{Loot_WEAPON,		0.2,		G36_C_SD_camo},
 	{Loot_WEAPON,		0.5,		M16A2_DZ}, //M16A2
-	{Loot_WEAPON,		0.2,		M16A2_GL_DZ}, //M16A2GL
+	//{Loot_WEAPON,		0.2,		M16A2_GL_DZ}, //M16A2GL //added to attachments system
 	{Loot_WEAPON,		0.1,		M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope)
 	{Loot_WEAPON,		0.5,		M4A1_DZ}, //M4A1
 	{Loot_WEAPON,		0.4,		M4A1_CCO_DZ}, //M4A1_Aim
 	{Loot_WEAPON,		0.1,		M4A1_AIM_SD_camo},
 	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_camo},
-	{Loot_WEAPON,		0.4,		M4A3_CCO_EP1},
+	{Loot_WEAPON,		0.3,		M4A3_CCO_EP1},
 	{Loot_WEAPON,		0.4,		SA58_DZ}, //Sa58P_EP1 (identical), Sa58V_EP1 (different stock)
 	{Loot_WEAPON,		0.3,		SA58_CCO_DZ}, //No camo, no grip handle
-	{Loot_WEAPON,		0.3,		Sa58V_CCO_EP1}, //Camo with grip handle
+	{Loot_WEAPON,		0.2,		Sa58V_CCO_EP1}, //Camo with grip handle
 	{Loot_WEAPON,		0.3,		SA58_ACOG_DZ}, //No camo, no grip handle
-	{Loot_WEAPON,		0.3,		Sa58V_RCO_EP1}, // Camo with grip handle
+	{Loot_WEAPON,		0.2,		Sa58V_RCO_EP1}, // Camo with grip handle
 	{Loot_WEAPON,		0.3,		SA58_RIS_DZ}, //SA58_DZ with different rail
 	{Loot_WEAPON,		0.4,		m8_compact},
 	{Loot_WEAPON,		0.3,		m8_sharpshooter},
-	{Loot_WEAPON,		0.5,		m8_holo_sd},
+	{Loot_WEAPON,		0.3,		m8_holo_sd},
 	{Loot_WEAPON,		0.5,		m8_carbine},
 	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_SUSAT},
-	{Loot_WEAPON,		0.1,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
-	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo}
+	{Loot_WEAPON,		0.3,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
+	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
+	//Epoch 1.0.6
+	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_ACOG}, //L85A2 ACOG
+	//Mk16
+	{Loot_WEAPON,		0.2,		SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC}, //Mk16 CQC 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC_Holo}, //Mk16 CQC EOTech 
+	{Loot_WEAPON,		0.2,		SCAR_L_CQC_EGLM_Holo}, //Mk16 EGLM EOTech,(40mm)
+	{Loot_WEAPON,		0.2,		SCAR_L_STD_EGLM_RCO}, //Mk16 EGLM RCO,(40mm)
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_HOLO}, //Mk16 EOTech 
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_Mk4CQT}, //Mk16 Mk4CQ/T 
+	//Mk17
+	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO}, //Mk17 Aimpoint
+	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO_SD}, //Mk17 Aimpoint SD 
+	{Loot_WEAPON,		0.1,		SCAR_H_STD_EGLM_Spect} //Mk17 EGLM ACOG,(40mm)	
 };
 machineguns[] = {
 	{Loot_WEAPON,		1.1,	RPK74_DZ}, //RPK_74
@@ -107,17 +124,21 @@ machineguns[] = {
 	{Loot_WEAPON,		1,		Pecheneg_DZ},
 	{Loot_WEAPON,		1,		PKM_DZ}, //PK_DZ
 	{Loot_WEAPON,		0.9,	L110A1_DZ}, //BAF_L110A1_Aim_DZE scope is slightly different from L110A1_CCO_DZ, otherwise identical
-	{Loot_WEAPON,		1,		MG36_camo},
+	{Loot_WEAPON,		0.9,		MG36_camo},
 	{Loot_WEAPON,		1,		M60A4_EP1_DZE},
 	{Loot_WEAPON,		1,		MG36},
 	{Loot_WEAPON,		1,		M249_m145_EP1_DZE},
 	{Loot_WEAPON,		1,		m240_scoped_EP1_DZE},
 	{Loot_WEAPON,		0.8,	M240_DZ},
 	{Loot_WEAPON,		0.9,	M249_DZ},
-	{Loot_WEAPON,		0.5,	Mk48_DZ} //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
+	{Loot_WEAPON,		0.5,	Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
+	//Epoch 1.0.6
+	{Loot_WEAPON,		0.9,	BAF_L86A2_ACOG} //L86A2 ACOG
 };
 militaryshotguns[] = {
 	{Loot_WEAPON,		2,		Saiga12K},
 	{Loot_WEAPON,		2,		Remington870_FL_DZ}, //Remington870_lamp
-	{Loot_WEAPON,		2,		M1014_DZ} //M1014
-};
+	{Loot_WEAPON,		2,		M1014_DZ}, //M1014
+	//Epoch 1.0.6
+	{Loot_WEAPON,		1,		AA12_PMC} //AA12 Shotgun
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Doctor.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Doctor.hpp
@@ -0,0 +1,16 @@
+ZombieDoctor[] =
+{
+	{Loot_MAGAZINE,		5,		ItemMorphine},
+	{Loot_MAGAZINE,		3,		ItemBloodTester},
+	{Loot_MAGAZINE,		5,		ItemHeatPack},
+	{Loot_MAGAZINE,		2,		ItemBloodbagEmpty},
+	{Loot_GROUP,		2,		Antibiotics},
+	{Loot_GROUP,		6,		Bloodbags},
+	{Loot_GROUP,		7,		MedicalLow}
+};
+
+ZombieDoctorViral[] =
+{
+	{Loot_GROUP,		10,		ZombieMedical},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Military.hpp
@@ -1,7 +1,7 @@
 ZombieMilitary[] =
 {
 	{Loot_MAGAZINE,		1,		FoodMRE},
-	{Loot_MAGAZINE,		2,		ItemHotwireKit},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
 	{Loot_GROUP,		3,		MedicalLow},
 	{Loot_GROUP,		10,		AmmoMilitaryLow},
 	{Loot_GROUP,		2,		AmmoMilitaryHigh},
@@ -12,4 +12,4 @@ ZombieMilitaryViral[] =
 {
 	{Loot_GROUP,		10,		ZombieMilitary},
 	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Pilot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Pilot.hpp
@@ -0,0 +1,15 @@
+ZombiePilot[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombiePilotViral[] =
+{
+	{Loot_GROUP,		10,		ZombieMilitary},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp
@@ -1,12 +1,10 @@
 ZombiePolice[] =
 {
 	{Loot_GROUP,		2,		Consumable},
-	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_GROUP,		3,		AmmoCivilian},
 	{Loot_MAGAZINE,		2,		ItemDocument},
-	{Loot_MAGAZINE,		3,		6Rnd_45ACP},
-	{Loot_MAGAZINE,		1,		8Rnd_12Gauge_Buck},
-	{Loot_MAGAZINE,		1,		ItemHotwireKit},
-	{Loot_MAGAZINE,		2,		ItemComboLock},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_MAGAZINE,		1,		ItemComboLock},
 	{Loot_MAGAZINE,		3,		HandRoadFlare}
 };

@@ -14,4 +12,4 @@ ZombiePoliceViral[] =
 {
 	{Loot_GROUP,		10,		ZombiePolice},
 	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Suit.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Suit.hpp
@@ -0,0 +1,15 @@
+ZombieSuit[] =
+{
+	{Loot_GROUP,		6,		Consumable},
+	{Loot_GROUP,		1,		AmmoCivilian},
+	{Loot_MAGAZINE,		3,		ItemBandage},
+	{Loot_MAGAZINE,		2,		ItemPainkiller},
+	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		3,		ItemDocument}
+};
+
+ZombieSuitViral[] =
+{
+	{Loot_GROUP,		10,		ZombieSuit},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Worker.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Worker.hpp
@@ -8,12 +8,12 @@ ZombieWorker[] =
 	{Loot_MAGAZINE,		2,		ItemDocument},
 	{Loot_MAGAZINE,		2,		ItemWire},
 	{Loot_MAGAZINE,		3,		ItemTankTrap},
-	{Loot_MAGAZINE,		3,		ItemComboLock},
+	{Loot_MAGAZINE,		2,		ItemComboLock},
 	{Loot_MAGAZINE,		2,		ItemSledgeHead}
 };

 ZombieWorkerViral[] =
 {
-	{Loot_GROUP,		10,		ZombieCivilian},
+	{Loot_GROUP,		10,		ZombieWorker},
 	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/README.txt
+++ b/SQF/dayz_code/Configs/CfgLoot/README.txt
@@ -1,6 +1,8 @@
-To use DZE_MissionLootTable = true; copy this CfgLoot folder to your mission.
+To customize the loot tables copy this CfgLoot folder to your mission.

-Then in description.ext add at the top:
+Then in description.ext replace this line:
+#include "\z\addons\dayz_code\Configs\CfgLoot\CfgLoot.hpp"
+with this:
 #include "CfgLoot\CfgLoot.hpp"


--- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp
@@ -8,7 +8,7 @@ class Attachment_GP25 : CA_Magazine
 	picture = "\z\addons\dayz_communityweapons\attachments\gp25\data\m_gp25_ca.paa";
 	
 	displayName = $STR_DZ_ATT_GP25_NAME;
-	descriptionShort = $STR_DZ_ATT_GP25_NAME;
+	descriptionShort = $STR_DZ_ATT_GP25_DESC;
 	
 	class ItemActions
 	{
@@ -18,4 +18,4 @@ class Attachment_GP25 : CA_Magazine
 			script = "; [_id,1] call player_attachAttachment";
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupBizon.hpp
@@ -7,8 +7,8 @@ class Attachment_SupBizon : CA_Magazine
 	model = "z\addons\dayz_communityassets\models\surpressor.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa";
 	
-	displayName = $STR_ATTACHMENT_NAME_SILENCER_BIZON;
-	descriptionShort = $STR_ATTACHMENT_DESC_SILENCER_BIZON;
+	displayName = $STR_DZ_ATT_SUP9BIZON_NAME;
+	descriptionShort = $STR_DZ_ATT_SUP9BIZON_DESC;
 	
 	class ItemActions
 	{
--- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/SupMakarov.hpp
@@ -7,8 +7,8 @@ class Attachment_SupMakarov : CA_Magazine
 	model = "z\addons\dayz_communityassets\models\surpressor.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\attachment_silencer.paa";
 	
-	displayName = $STR_ATTACHMENT_NAME_SILENCER_MAKAROV;
-	descriptionShort = $STR_ATTACHMENT_DESC_SILENCER_MAKAROV;
+	displayName = $STR_DZ_ATT_SUP9PM_NAME;
+	descriptionShort = $STR_DZ_ATT_SUP9PM_DESC;
 	
 	class ItemActions
 	{
--- a/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
@@ -3,7 +3,8 @@ class CfgMagazines
 	//External references
 	class CA_Magazine;
 	class HandGrenade;
-	
+	class TimeBomb;
+	class CA_LauncherMagazine;
 	
 	
 	//Weapon magazines
--- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp
@@ -21,7 +21,7 @@ class SkinBase : CA_Magazine
 		
 		class tearClothes
 		{
-			text = "Tear Clothes";
+			text = $STR_TEAR_CLOTHES;
 			script = "spawn player_tearClothes;";
 		};
 		class Crafting {
--- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp
@@ -1,122 +1,122 @@
 class Skin_Rocket_DZ: SkinBase {
 	scope = public;
-	displayName = "Officer Suit";
-	descriptionShort = "Officer Suit";
+	displayName = $STR_EPOCH_SKINS_OFFICERSUIT;
+	descriptionShort = $STR_EPOCH_SKINS_OFFICERSUIT;
 };
 class Skin_RU_Policeman_DZ: SkinBase {
 	scope = public;
-	displayName = "Sergei";
-	descriptionShort = "Police Officer Uniform";
+	displayName = $STR_EPOCH_SKINS_SERGEI;
+	descriptionShort = $STR_EPOCH_SKINS_SERGEI_DESC;
 };
 class Skin_Pilot_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Ethan";
-	descriptionShort = "Pilot Uniform";
+	displayName = $STR_EPOCH_SKINS_ETHAN;
+	descriptionShort = $STR_EPOCH_SKINS_ETHAN_DESC;
 };
 class Skin_Haris_Press_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Harry";
-	descriptionShort = "Press Uniform";
+	displayName = $STR_EPOCH_SKINS_HARRY;
+	descriptionShort = $STR_EPOCH_SKINS_HARRY_DESC;
 };
 class Skin_Ins_Soldier_GL_DZ: SkinBase {
 	scope = public;
-	displayName = "Terrorist Uniform";
-	descriptionShort = "Terrorist Uniform";
+	displayName = $STR_EPOCH_SKINS_TERRORISTUNIFORM;
+	descriptionShort = $STR_EPOCH_SKINS_TERRORISTUNIFORM;
 };
 class Skin_GUE_Commander_DZ: SkinBase {
 	scope = public;
-	displayName = "Rebel Uniform";
-	descriptionShort = "Rebel Uniform";
+	displayName = $STR_EPOCH_SKINS_REBELUNIFORM;
+	descriptionShort = $STR_EPOCH_SKINS_REBELUNIFORM;
 };
 class Skin_Functionary1_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Donald";
-	descriptionShort = "Business Suit";
+	displayName = $STR_EPOCH_SKINS_DONALD;
+	descriptionShort = $STR_EPOCH_SKINS_DONALD_DESC;
 };
 class Skin_Priest_DZ: SkinBase {
 	scope = public;
-	displayName = "James";
-	descriptionShort = "Priest Outfit";
+	displayName = $STR_EPOCH_SKINS_JAMES;
+	descriptionShort = $STR_EPOCH_SKINS_JAMES_DESC;
 };
 class Skin_Rocker1_DZ: SkinBase {
 	scope = public;
-	displayName = "Duane";
-	descriptionShort = "Rocker (black)";
+	displayName = $STR_EPOCH_SKINS_DUANE;
+	descriptionShort = $STR_EPOCH_SKINS_DUANE_DESC;
 };
 class Skin_Rocker2_DZ: SkinBase {
 	scope = public;
-	displayName = "Rod";
-	descriptionShort = "Rocker (brown)";
+	displayName = $STR_EPOCH_SKINS_ROD;
+	descriptionShort = $STR_EPOCH_SKINS_ROD_DESC;
 };
 class Skin_Rocker3_DZ: SkinBase {
 	scope = public;
-	displayName = "Van";
-	descriptionShort = "Rocker (blue)";
+	displayName = $STR_EPOCH_SKINS_VAN;
+	descriptionShort = $STR_EPOCH_SKINS_VAN_DESC;
 };
 class Skin_Rocker4_DZ: SkinBase {
 	scope = public;
-	displayName = "Bruce";
-	descriptionShort = "Rocker (green)";
+	displayName = $STR_EPOCH_SKINS_BRUCE;
+	descriptionShort = $STR_EPOCH_SKINS_BRUCE_DESC;
 };
 class Skin_Bandit1_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Outfit";
-	descriptionShort = "Bandit Outfit";
+	displayName = $STR_EPOCH_SKINS_BANDITOUTFIT;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITOUTFIT;
 };
 class Skin_Bandit2_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Camo";
-	descriptionShort = "Bandit Camo Outfit";
+	displayName = $STR_EPOCH_SKINS_BANDITCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITCAMO_DESC;
 };
 class Skin_GUE_Soldier_MG_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Gunner";
-	descriptionShort = "Bandit Gunner Outfit";
+	displayName = $STR_EPOCH_SKINS_BANDITGUNNER;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITGUNNER_DESC;
 };
 class Skin_GUE_Soldier_Sniper_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Sniper";
-	descriptionShort = "Bandit Sniper Outfit";
+	displayName = $STR_EPOCH_SKINS_BANDITSNIPER;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITSNIPER_DESC;
 };
 class Skin_GUE_Soldier_Crew_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Baklava";
-	descriptionShort = "Bandit Baklava Outfit";
+	displayName = $STR_EPOCH_SKINS_BANDITBAKLAVA;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITBAKLAVA_DESC;
 };
 class Skin_GUE_Soldier_CO_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Mask";
-	descriptionShort = "Bandit Mask Outfit";
+	displayName = $STR_EPOCH_SKINS_BANDITMASK;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITMASK_DESC;
 };
 class Skin_GUE_Soldier_2_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Hat";
-	descriptionShort = "Bandit Hat with Baklava";
+	displayName = $STR_EPOCH_SKINS_BANDITHAT;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITHAT_DESC;
 };
 class Skin_BanditW1_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Annie";
-	descriptionShort = "Bandit wrap blue top with brown pants.";
+	displayName = $STR_EPOCH_SKINS_BANDITANNIE;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITANNIE_DESC;
 };
 class Skin_BanditW2_DZ: SkinBase {
 	scope = public;
-	displayName = "Bandit Jane";
-	descriptionShort = "Bandit wrap grey top with brown camo pants.";
+	displayName = $STR_EPOCH_SKINS_BANDITJANE;
+	descriptionShort = $STR_EPOCH_SKINS_BANDITJANE_DESC;
 };
 class Skin_SurvivorW3_DZ: SkinBase {
 	scope = public;
-	displayName = "Jane";
-	descriptionShort = "Grey top with brown camo pants.";
+	displayName = $STR_EPOCH_SKINS_JANE;
+	descriptionShort = $STR_EPOCH_SKINS_JANE_DESC;
 };
 class Skin_SurvivorW2_DZ: SkinBase {
 	scope = public;
-	displayName = "Annie";
-	descriptionShort = "Civilian (female)";
+	displayName = $STR_EPOCH_SKINS_ANNIE;
+	descriptionShort = $STR_EPOCH_SKINS_ANNIE_DESC;
 };
 class Skin_SurvivorWpink_DZ: SkinBase {
 	scope = public;
-	displayName = "Melly (female)";
-	descriptionShort = "Purple top with blue pants.";
+	displayName = $STR_EPOCH_SKINS_MELLY;
+	descriptionShort = $STR_EPOCH_SKINS_MELLY_DESC;
 };
 /*
 class Skin_SurvivorWsequisha_DZ: SkinBase {
@@ -132,117 +132,293 @@ class Skin_SurvivorWsequishaD_DZ: SkinBase {
 */
 class Skin_SurvivorWcombat_DZ: SkinBase {
 	scope = public;
-	displayName = "Alejandria";
-	descriptionShort = "Blue camo top with brown camo pants.";
+	displayName = $STR_EPOCH_SKINS_ALEJANDRIA;
+	descriptionShort = $STR_EPOCH_SKINS_ALEJANDRIA_DESC;
 };
 class Skin_SurvivorWdesert_DZ: SkinBase {
 	scope = public;
-	displayName = "Savannah";
-	descriptionShort = "White top with brown pants.";
+	displayName = $STR_EPOCH_SKINS_SAVANNAH;
+	descriptionShort = $STR_EPOCH_SKINS_SAVANNAH_DESC;
 };
 class Skin_SurvivorWurban_DZ: SkinBase {
 	scope = public;
-	displayName = "Sophia";
-	descriptionShort = "Maroon top with grey pants.";
+	displayName = $STR_EPOCH_SKINS_SOPHIA;
+	descriptionShort = $STR_EPOCH_SKINS_SOPHIA_DESC;
 };
 class Skin_TK_INS_Warlord_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Takistani Warlord";
-	descriptionShort = "Takistani Warlord";
+	displayName = $STR_EPOCH_SKINS_TAKISTANIWARLORD;
+	descriptionShort = $STR_EPOCH_SKINS_TAKISTANIWARLORD;
 };
 class Skin_TK_INS_Soldier_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Takistani Soldier";
-	descriptionShort = "Takistani Soldier";
+	displayName = $STR_EPOCH_SKINS_TAKISTANISOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_TAKISTANISOLDIER;
 };
 class Skin_CZ_Special_Forces_GL_DES_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Special Forces";
-	descriptionShort = "Special Forces";
+	displayName = $STR_EPOCH_SKINS_SPECIALFORCES;
+	descriptionShort = $STR_EPOCH_SKINS_SPECIALFORCES;
 };
 class Skin_Drake_Light_DZ: SkinBase {
 	scope = public;
-	displayName = "Desert Camo";
-	descriptionShort = "Desert Camo";
+	displayName = $STR_EPOCH_SKINS_DESERTCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_DESERTCAMO;
 };
 class Skin_Soldier_Bodyguard_AA12_PMC_DZ: SkinBase {
 	scope = public;
-	displayName = "Bodyguard";
-	descriptionShort = "Bodyguard";
+	displayName = $STR_EPOCH_SKINS_BODYGUARD;
+	descriptionShort = $STR_EPOCH_SKINS_BODYGUARD;
 };
 class Skin_FR_OHara_DZ: SkinBase {
 	scope = public;
-	displayName = "Jungle Camo";
-	descriptionShort = "Jungle Camo";
+	displayName = $STR_EPOCH_SKINS_JUNGLECAMO;
+	descriptionShort = $STR_EPOCH_SKINS_JUNGLECAMO;
 };
 class Skin_FR_Rodriguez_DZ: SkinBase {
 	scope = public;
-	displayName = "Gunner Outfit";
-	descriptionShort = "Gunner Outfit";
+	displayName = $STR_EPOCH_SKINS_GUNNEROUTFIT;
+	descriptionShort = $STR_EPOCH_SKINS_GUNNEROUTFIT;
 };
 class Skin_CZ_Soldier_Sniper_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Desert Ghillie";
-	descriptionShort = "Desert Ghillie";
+	displayName = $STR_EPOCH_SKINS_DESERTGHILLIE;
+	descriptionShort = $STR_EPOCH_SKINS_DESERTGHILLIE;
 };
 class Skin_Graves_Light_DZ: SkinBase {
 	scope = public;
-	displayName = "Urban Camo";
-	descriptionShort = "Urban Camo";
+	displayName = $STR_EPOCH_SKINS_URBANCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_URBANCAMO;
 };
 class Skin_Soldier_Sniper_PMC_DZ: SkinBase {
 	scope = public;
-	displayName = "Marksman";
-	descriptionShort = "Marksman";
+	displayName = $STR_EPOCH_SKINS_MARKSMAN;
+	descriptionShort = $STR_EPOCH_SKINS_MARKSMAN;
 };
 class Skin_Soldier_TL_PMC_DZ: SkinBase {
 	scope = public;
-	displayName = "Team Leader";
-	descriptionShort = "Team Leader";
+	displayName = $STR_EPOCH_SKINS_TEAMLEADER;
+	descriptionShort = $STR_EPOCH_SKINS_TEAMLEADER;
 };
 // new
 class Skin_TK_Special_Forces_MG_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Smuggler";
-	descriptionShort = "Smuggler";
+	displayName = $STR_EPOCH_SKINS_SMUGGLER;
+	descriptionShort = $STR_EPOCH_SKINS_SMUGGLER;
 };
 class Skin_TK_Soldier_Sniper_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "Desert Sniper";
-	descriptionShort = "Desert Sniper";
+	displayName = $STR_EPOCH_SKINS_DESERTSNIPER;
+	descriptionShort = $STR_EPOCH_SKINS_DESERTSNIPER;
 };
 class Skin_TK_Commander_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = "General";
-	descriptionShort = "General";
+	displayName = $STR_GENERAL;
+	descriptionShort = $STR_GENERAL;
 };
 class Skin_RU_Soldier_Crew_DZ: SkinBase {
 	scope = public;
-	displayName = "Crewman";
-	descriptionShort = "Crewman";
+	displayName = $STR_EPOCH_SKINS_CREWMAN;
+	descriptionShort = $STR_EPOCH_SKINS_CREWMAN;
 };
 class Skin_INS_Lopotev_DZ: SkinBase {
 	scope = public;
-	displayName = "Boss";
-	descriptionShort = "Team Leader";
+	displayName = $STR_EPOCH_SKINS_BOSS;
+	descriptionShort = $STR_EPOCH_SKINS_BOSS_DESC;
 };
 class Skin_INS_Soldier_AR_DZ: SkinBase {
 	scope = public;
-	displayName = "Cooper";
-	descriptionShort = "Cooper";
+	displayName = $STR_EPOCH_SKINS_COOPER;
+	descriptionShort = $STR_EPOCH_SKINS_COOPER;
 };
 class Skin_INS_Soldier_CO_DZ: SkinBase {
 	scope = public;
-	displayName = "Travis";
-	descriptionShort = "Travis";
+	displayName = $STR_EPOCH_SKINS_TRAVIS;
+	descriptionShort = $STR_EPOCH_SKINS_TRAVIS;
 };
 class Skin_INS_Bardak_DZ: SkinBase {
 	scope = public;
-	displayName = "Paulo";
-	descriptionShort = "Paulo";
+	displayName = $STR_EPOCH_SKINS_PAULO;
+	descriptionShort = $STR_EPOCH_SKINS_PAULO;
 };
 class Skin_INS_Worker2_DZ: SkinBase {
 	scope = public;
-	displayName = "Steve";
-	descriptionShort = "Steve";
-};
+	displayName = $STR_EPOCH_SKINS_STEVE;
+	descriptionShort = $STR_EPOCH_SKINS_STEVE;
+};
+//new Epoch 1.06
+class Skin_USMC_Soldier_Officer_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USMCOFFICER;
+	descriptionShort = $STR_EPOCH_SKINS_USMCOFFICER;
+};
+class Skin_USMC_Soldier_MG_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USMCSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_USMCSOLDIER;
+};
+class Skin_USMC_Soldier_Pilot_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USMCPILOT;
+	descriptionShort = $STR_EPOCH_SKINS_USMCPILOT;
+};
+class Skin_FR_TL_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMOTEAMLEADER;
+	descriptionShort = $STR_EPOCH_SKINS_CAMOTEAMLEADER;
+};
+class Skin_FR_R_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMORECON;
+	descriptionShort = $STR_EPOCH_SKINS_CAMORECON;
+};
+class Skin_FR_Marksman_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMOMARKSMAN;
+	descriptionShort = $STR_EPOCH_SKINS_CAMOMARKSMAN;
+};
+class Skin_FR_Assault_R_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMOASSAULT;
+	descriptionShort = $STR_EPOCH_SKINS_CAMOASSAULT;
+};
+class Skin_RU_Soldier_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_RUSOLDIER;
+};
+class Skin_RU_Soldier_Officer_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUOFFICER;
+	descriptionShort = $STR_EPOCH_SKINS_RUOFFICER;
+};
+class Skin_RUS_Soldier1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_RUCAMO;
+};
+class Skin_RUS_Commander_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUCOMMANDER;
+	descriptionShort = $STR_EPOCH_SKINS_RUCOMMANDER;
+};
+class Skin_MVD_Soldier_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_MVDSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_MVDSOLDIER;
+};
+class Skin_Ins_Soldier_2_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TERRORISTCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_TERRORISTCAMO;
+};
+class Skin_Ins_Commander_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_INSCOMMANDER;
+	descriptionShort = $STR_EPOCH_SKINS_INSCOMMANDER;
+};
+class Skin_Ins_Soldier_Crew_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_INSCREWMAN;
+	descriptionShort = $STR_EPOCH_SKINS_INSCREWMAN;
+};
+class Skin_CDF_Soldier_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CDFSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_CDFSOLDIER;
+};
+class Skin_Assistant_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_ASSISTANT;
+	descriptionShort = $STR_EPOCH_SKINS_ASSISTANT;
+};
+class Skin_Doctor_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_DOCTOR;
+	descriptionShort = $STR_EPOCH_SKINS_DOCTOR;
+};
+class Skin_Worker1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_WORKER1;
+	descriptionShort = $STR_EPOCH_SKINS_WORKER1;
+};
+class Skin_Worker3_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_WORKER2;
+	descriptionShort = $STR_EPOCH_SKINS_WORKER2;
+};
+class Skin_Worker4_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_WORKER3;
+	descriptionShort = $STR_EPOCH_SKINS_WORKER3;
+};
+class Skin_TK_CIV_Takistani01_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN1;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN1;
+};
+class Skin_TK_CIV_Takistani03_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN2;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN2;
+};
+class Skin_TK_CIV_Takistani04_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN3;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN3;
+};
+class Skin_TK_CIV_Takistani06_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN4;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN4;
+};
+class Skin_TK_INS_Soldier_AR_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_TKSOLDIER;
+};
+class Skin_TK_GUE_Soldier_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKGUESOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_TKGUESOLDIER;
+};
+class Skin_CZ_Soldier_SL_DES_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CZSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_CZSOLDIER;
+};
+class Skin_US_Soldier_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_USSOLDIER;
+};
+class Skin_UN_CDF_Soldier_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_UNSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_UNSOLDIER;
+};
+class Skin_UN_CDF_Soldier_Guard_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_UNCOMMANDER;
+	descriptionShort = $STR_EPOCH_SKINS_UNCOMMANDER;
+};
+class Skin_GER_Soldier_TL_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_GERRECON;
+	descriptionShort = $STR_EPOCH_SKINS_GERRECON;
+};
+class Skin_BAF_Soldier_Officer_MTP_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_BAFOFFICER;
+	descriptionShort = $STR_EPOCH_SKINS_BAFOFFICER;
+};
+class Skin_BAF_Soldier_N_MTP_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_BAFSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_BAFSOLDIER;
+};
+class Skin_FR_Sapper_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_FRSAPPER;
+	descriptionShort = $STR_EPOCH_SKINS_FRSAPPER;
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Canteen.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Canteen.hpp
@@ -23,7 +23,7 @@ class ItemCanteen : FoodDrink
 		
 		class Empty
 		{
-			text = "Empty";//TODO: move to stringtable
+			text = $STR_ITEM_CANTEEN_EMPTY;
 			script = "spawn player_emptyContainer";
 		};
 	};
--- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp
@@ -40,8 +40,8 @@ class ItemSodaMtngreen : ItemSoda
 	
 	model = "z\addons\dayz_communityassets\models\soda_mtngreen_clean_full.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_soda_mtngreen_clean_full_ca.paa";
-	displayName = $STR_EQUIP_NAME_37;
-	descriptionShort = $STR_EQUIP_NAME_37;
+	displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_0;
+	descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_0;
 	
 	Nutrition[] = {90,0,500,0};
 	
@@ -250,8 +250,8 @@ class ItemSherbet : ItemSoda
 	
 	model = "z\addons\dayz_communityassets\models\soda_sherbet_clean_full.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sherbet_clean_full_ca.paa";
-	displayName = "Sherbet";//TODO: move to stringtable
-	descriptionShort = "Sherbet";
+	displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15;
+	descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_15;
 	
 	Nutrition[] = {90,0,500,0};
 	
--- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp
@@ -2,8 +2,8 @@ class ItemWaterBottle : FoodDrink
 {
 	scope = public;
 	
-	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
-	picture = "\z\addons\dayz_communityassets\textures\waterbottle.paa";
+	model = "\dayz_equip\models\waterbottle_gear.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
 	displayName = $STR_EQUIP_NAME_12;
 	descriptionShort = $STR_EQUIP_DESC_12;
 	
@@ -23,7 +23,7 @@ class ItemWaterBottle : FoodDrink
 		
 		class Empty
 		{
-			text = "Empty";//TODO: move to stringtable
+			text = $STR_EQUIP_NAME_13_EMPTY;
 			script = "spawn player_emptyContainer";
 		};
 	};
--- a/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_carbomb.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_carbomb.hpp
@@ -2,7 +2,7 @@
 class ItemCarBomb : CA_Magazine {
 	scope = public;
 	count = 1;
-	type = (2*256);
+	type = 256;
 	displayName = "Car Bomb";
 	model = "\ca\weapons\explosive.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa";
--- a/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_crate.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_crate.hpp
@@ -5,5 +5,5 @@ class equip_crate : CA_Magazine {
 	descriptionShort = $STR_ITEM_DESC_equip_crate;
 	model = "\z\addons\dayz_communityassets\models\crate.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_crate.paa";
-	type = (256 * 2);
+	type = 256;
 };
--- a/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_rope.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_rope.hpp
@@ -14,7 +14,7 @@ class equip_rope : CA_Magazine {
 			script = "spawn player_craftItem;";
 			neednearby[] = {}; 
 			requiretools[] = {""};
-			output[] = {{"equip_string","CfgMagazines",3}};
+			output[] = {{"equip_string","CfgMagazines",2}};
 			input[] = {{"equip_rope","CfgMagazines",1}};
 		};
 	};
--- a/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_woodensplint.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_woodensplint.hpp
@@ -5,7 +5,7 @@ class equip_woodensplint : CA_Magazine {
 	descriptionShort = $STR_ITEM_DESC_WOODENSPLINT;
 	model = "\z\addons\dayz_communityassets\models\woodensplint.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_woodensplint_ca.paa";
-	type = 256;
+	type = 256; //WeaponSlotItem * 2 in vanilla
 	class ItemActions {
 		class Use {
 			text = $STR_ACTIONS_BRACE_LEG;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Bulk.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Bulk.hpp
@@ -9,6 +9,7 @@ class bulk: CA_Magazine {
 	weight = 5;
 };
 class bulk_empty: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_EMPTY;
 	descriptionShort = $STR_EPOCH_BULK_DESC_EMPTY;
 	weight = 5;
 	class ItemActions {
@@ -65,6 +66,7 @@ class bulk_empty: bulk {
 };

 class bulk_ItemSodaCoke: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODACOKE_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_HALF;
 	weight = 6;
 	class ItemActions {
@@ -84,6 +86,7 @@ class bulk_ItemSodaCoke: bulk {
 	};
 };
 class bulk_ItemSodaCokeFull: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODACOKE_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_FULL;
 	weight = 7;
 	class ItemActions {
@@ -96,6 +99,7 @@ class bulk_ItemSodaCokeFull: bulk {
 };

 class bulk_ItemSodaPepsi: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_HALF;
 	weight = 6;
 	class ItemActions {
@@ -115,6 +119,7 @@ class bulk_ItemSodaPepsi: bulk {
 	};
 };
 class bulk_ItemSodaPepsiFull: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_FULL;
 	weight = 7;
 	class ItemActions {
@@ -127,6 +132,7 @@ class bulk_ItemSodaPepsiFull: bulk {
 };

 class bulk_FoodbaconCooked: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_BACON_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_BACON_HALF;
 	weight = 5;
 	class ItemActions {
@@ -146,6 +152,7 @@ class bulk_FoodbaconCooked: bulk {
 	};
 };
 class bulk_FoodbaconCookedFull: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_BACON_FULL;
 	descriptionshort = $STR_EPOCH_BULK_DESC_BACON_FULL;
 	weight = 5;
 	class ItemActions {
@@ -159,6 +166,7 @@ class bulk_FoodbaconCookedFull: bulk {

 // Ammo
 class bulk_17Rnd_9x19_glock17: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_G17;
 	descriptionShort = $STR_EPOCH_BULK_DESC_G17;
 	weight = 17;
 	class ItemActions {
@@ -170,6 +178,7 @@ class bulk_17Rnd_9x19_glock17: bulk {
 	};
 };
 class bulk_15Rnd_9x19_M9SD: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_M9SD;
 	descriptionShort = $STR_EPOCH_BULK_DESC_M9SD;
 	weight = 17;
 	class ItemActions {
@@ -181,6 +190,7 @@ class bulk_15Rnd_9x19_M9SD: bulk {
 	};
 };
 class bulk_30Rnd_9x19_MP5SD: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_MP5SD;
 	descriptionShort = $STR_EPOCH_BULK_DESC_MP5SD;
 	weight = 18;
 	class ItemActions {
@@ -192,6 +202,7 @@ class bulk_30Rnd_9x19_MP5SD: bulk {
 	};
 };
 class bulk_30Rnd_556x45_StanagSD: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_STANAGSD;
 	descriptionShort = $STR_EPOCH_BULK_DESC_STANAGSD;
 	weight = 20;
 	class ItemActions {
@@ -204,6 +215,7 @@ class bulk_30Rnd_556x45_StanagSD: bulk {
 };

 class bulk_ItemSandbag: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SANDBAG;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SANDBAG;
 	weight = 60;
 	class ItemActions {
@@ -216,6 +228,7 @@ class bulk_ItemSandbag: bulk {
 };

 class bulk_ItemTankTrap: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_FULL;
 	weight = 25;
 	class ItemActions {
@@ -227,6 +240,7 @@ class bulk_ItemTankTrap: bulk {
 	};
 };
 class bulk_ItemTankTrapHalf: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_HALF;
 	weight = 12.5;
 	class ItemActions {
@@ -247,6 +261,7 @@ class bulk_ItemTankTrapHalf: bulk {
 };

 class bulk_ItemWire: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_WIREKIT_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_FULL;
 	weight = 25;
 	class ItemActions {
@@ -258,6 +273,7 @@ class bulk_ItemWire: bulk {
 	};
 };
 class bulk_ItemWireHalf: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_WIREKIT_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_HALF;
 	weight = 12.5;
 	class ItemActions {
@@ -278,6 +294,7 @@ class bulk_ItemWireHalf: bulk {
 };

 class bulk_PartGeneric: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_GENERIC_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_FULL;
 	weight = 60;
 	class ItemActions {
@@ -289,6 +306,7 @@ class bulk_PartGeneric: bulk {
 	};
 };
 class bulk_PartGenericHalf: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_GENERIC_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_HALF;
 	weight = 30;
 	class ItemActions {
@@ -306,4 +324,4 @@ class bulk_PartGenericHalf: bulk {
 			input[] = {{"bulk_PartGenericHalf",1},{"PartGeneric",6}};
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/AluminumBar.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/AluminumBar.hpp
@@ -2,20 +2,20 @@ class ItemAluminumBar: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Aluminum";
+	displayName = $STR_EPOCH_ALUMINUM;
 	model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_CA.paa";
-	descriptionShort = "Aluminum Bar";
+	descriptionShort = $STR_EPOCH_ALUMINUM_DESC;

 };
 class ItemAluminumBar10oz: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "10oz Aluminum";
+	displayName = $STR_EPOCH_10OZALUMINUM;
 	model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_10oz_CA.paa";
-	descriptionShort = "10oz Aluminum Bar";
+	descriptionShort = $STR_EPOCH_10OZALUMINUM_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_211;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/Briefcase.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/Briefcase.hpp
@@ -2,14 +2,14 @@ class ItemBriefcase_Base: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Briefcase";
+	displayName = $STR_EPOCH_BRIEFCASE;
 	model = "\z\addons\dayz_epoch\models\briefcase.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
 };
 // Gold
 class ItemBriefcaseEmpty: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
-	descriptionShort = "Empty Briefcase";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_EMPTY;
 	weight = 1;
 	class ItemActions {
 		class Crafting {
@@ -48,7 +48,7 @@ class ItemBriefcaseEmpty: ItemBriefcase_Base {
 };
 class ItemBriefcase10oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 1 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_1X10OZGOLD;
 	weight = 1.2;
 	worth = 1000;
 	class ItemActions {
@@ -80,7 +80,7 @@ class ItemBriefcase10oz: ItemBriefcase_Base {
 };
 class ItemBriefcase20oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 2 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_2X10OZGOLD;
 	weight = 1.5;
 	worth = 2000;
 	class ItemActions {
@@ -120,7 +120,7 @@ class ItemBriefcase20oz: ItemBriefcase_Base {
 };
 class ItemBriefcase30oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 3 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_3X10OZGOLD;
 	weight = 1.8;
 	worth = 3000;
 	class ItemActions {
@@ -160,7 +160,7 @@ class ItemBriefcase30oz: ItemBriefcase_Base {
 };
 class ItemBriefcase40oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 4 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_4X10OZGOLD;
 	weight = 2.1;
 	worth = 4000;
 	class ItemActions {
@@ -200,7 +200,7 @@ class ItemBriefcase40oz: ItemBriefcase_Base {
 };
 class ItemBriefcase50oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 5 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_5X10OZGOLD;
 	weight = 2.4;
 	worth = 5000;
 	class ItemActions {
@@ -240,7 +240,7 @@ class ItemBriefcase50oz: ItemBriefcase_Base {
 };
 class ItemBriefcase60oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 6 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_6X10OZGOLD;
 	weight = 2.7;
 	worth = 6000;
 	class ItemActions {
@@ -280,7 +280,7 @@ class ItemBriefcase60oz: ItemBriefcase_Base {
 };
 class ItemBriefcase70oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 7 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_7X10OZGOLD;
 	weight = 2.9;
 	worth = 7000;
 	class ItemActions {
@@ -320,7 +320,7 @@ class ItemBriefcase70oz: ItemBriefcase_Base {
 };
 class ItemBriefcase80oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 8 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_8X10OZGOLD;
 	weight = 3.2;
 	worth = 8000;
 	class ItemActions {
@@ -360,7 +360,7 @@ class ItemBriefcase80oz: ItemBriefcase_Base {
 };
 class ItemBriefcase90oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 9 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_9X10OZGOLD;
 	weight = 3.5;
 	worth = 9000;
 	class ItemActions {
@@ -392,7 +392,7 @@ class ItemBriefcase90oz: ItemBriefcase_Base {
 };
 class ItemBriefcase100oz: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 10 x 10oz Gold Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_10X10OZGOLD;
 	weight = 3.8;
 	worth = 10000;
 	class ItemActions {
@@ -421,7 +421,7 @@ class ItemSilvercase_Base: ItemBriefcase_Base {
 };
 class ItemBriefcaseS10oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_10oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 1 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_1X10OZSILVER;
 	weight = 1.2;
 	worth = 10;
 	class ItemActions {
@@ -453,7 +453,7 @@ class ItemBriefcaseS10oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS20oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_20oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 2 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_2X10OZSILVER;
 	weight = 1.5;
 	worth = 20;
 	class ItemActions {
@@ -493,7 +493,7 @@ class ItemBriefcaseS20oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS30oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_30oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 3 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_3X10OZSILVER;
 	weight = 1.8;
 	worth = 30;
 	class ItemActions {
@@ -533,7 +533,7 @@ class ItemBriefcaseS30oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS40oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_40oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 4 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_4X10OZSILVER;
 	weight = 2.1;
 	worth = 40;
 	class ItemActions {
@@ -573,7 +573,7 @@ class ItemBriefcaseS40oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS50oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_50oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 5 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_5X10OZSILVER;
 	weight = 2.4;
 	worth = 50;
 	class ItemActions {
@@ -613,7 +613,7 @@ class ItemBriefcaseS50oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS60oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_60oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 6 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_6X10OZSILVER;
 	weight = 2.7;
 	worth = 60;
 	class ItemActions {
@@ -653,7 +653,7 @@ class ItemBriefcaseS60oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS70oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_70oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 7 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_7X10OZSILVER;
 	weight = 2.9;
 	worth = 70;
 	class ItemActions {
@@ -693,7 +693,7 @@ class ItemBriefcaseS70oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS80oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_80oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 8 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_8X10OZSILVER;
 	weight = 3.2;
 	worth = 80;
 	class ItemActions {
@@ -733,7 +733,7 @@ class ItemBriefcaseS80oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS90oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_90oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 9 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_9X10OZSILVER;
 	weight = 3.5;
 	worth = 90;
 	class ItemActions {
@@ -765,7 +765,7 @@ class ItemBriefcaseS90oz: ItemSilvercase_Base {
 };
 class ItemBriefcaseS100oz: ItemSilvercase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_100oz_CA.paa";
-	descriptionShort = "Briefcase (Contains: 10 x 10oz Silver Bar)";
+	descriptionShort = $STR_EPOCH_BRIEFCASE_10X10OZSILVER;
 	weight = 3.8;
 	worth = 100;
 	class ItemActions {
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/BronzeBar.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/BronzeBar.hpp
@@ -2,8 +2,8 @@ class ItemBronzeBar: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Bronze";
+	displayName = $STR_EPOCH_BRONZE;
 	model = "\z\addons\dayz_epoch\models\bronze_bar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_bar_bronze_CA.paa";
-	descriptionShort = "Bronze Bar";
+	descriptionShort = $STR_EPOCH_BRONZE_DESC;
 };
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/CopperBar.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/CopperBar.hpp
@@ -2,13 +2,13 @@ class ItemCopperBar: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Copper";
+	displayName = $STR_EPOCH_COPPER;
 	model = "\z\addons\dayz_epoch\models\copper_bar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_CA.paa";
-	descriptionShort = "Copper Bar";
+	descriptionShort = $STR_EPOCH_COPPER_DESC;
 	class ItemActions {
 		class Crafting {
-			text = $STR_EPOCH_PLAYER_210;
+			text = $STR_EPOCH_PLAYER_210_9;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {};
@@ -21,10 +21,10 @@ class ItemCopperBar10oz: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "10oz Copper";
+	displayName = $STR_EPOCH_10OZCOPPER;
 	model = "\z\addons\dayz_epoch\models\copper_bar_10oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_10oz_CA.paa";
-	descriptionShort = "10oz Copper Bar";
+	descriptionShort = $STR_EPOCH_10OZCOPPER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_211;
@@ -35,4 +35,4 @@ class ItemCopperBar10oz: CA_Magazine {
 			input[] = {{"ItemCopperBar10oz",1}};
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/GoldBar.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/GoldBar.hpp
@@ -3,10 +3,10 @@ class ItemGoldBar: CA_Magazine {
 	count = 1;
 	worth = 100;
 	type = 256;
-	displayName = "Gold";
+	displayName = $STR_EPOCH_GOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar1oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "Gold Bar";
+	descriptionShort = $STR_EPOCH_GOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -32,10 +32,10 @@ class ItemGoldBar2oz: CA_Magazine {
 	count = 1;
 	worth = 200;
 	type = 256;
-	displayName = "2oz Gold";
+	displayName = $STR_EPOCH_2OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar2oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "2 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_2OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -70,10 +70,10 @@ class ItemGoldBar3oz: CA_Magazine {
 	count = 1;
 	worth = 300;
 	type = 256;
-	displayName = "3oz Gold";
+	displayName = $STR_EPOCH_3OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar3oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "3 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_3OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -116,10 +116,10 @@ class ItemGoldBar4oz: CA_Magazine {
 	count = 1;
 	worth = 400;
 	type = 256;
-	displayName = "4oz Gold";
+	displayName = $STR_EPOCH_4OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar4oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "4 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_4OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -162,10 +162,10 @@ class ItemGoldBar5oz: CA_Magazine {
 	count = 1;
 	worth = 500;
 	type = 256;
-	displayName = "5oz Gold";
+	displayName = $STR_EPOCH_5OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar5oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "5 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_5OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -208,10 +208,10 @@ class ItemGoldBar6oz: CA_Magazine {
 	count = 1;
 	worth = 600;
 	type = 256;
-	displayName = "6oz Gold";
+	displayName = $STR_EPOCH_6OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar6oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "6 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_6OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -254,10 +254,10 @@ class ItemGoldBar7oz: CA_Magazine {
 	count = 1;
 	worth = 700;
 	type = 256;
-	displayName = "7oz Gold";
+	displayName = $STR_EPOCH_7OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar7oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "7 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_7OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -300,10 +300,10 @@ class ItemGoldBar8oz: CA_Magazine {
 	count = 1;
 	worth = 800;
 	type = 256;
-	displayName = "8oz Gold";
+	displayName = $STR_EPOCH_8OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar8oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "8 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_8OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -346,10 +346,10 @@ class ItemGoldBar9oz: CA_Magazine {
 	count = 1;
 	worth = 900;
 	type = 256;
-	displayName = "9oz Gold";
+	displayName = $STR_EPOCH_9OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar9oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
-	descriptionShort = "9 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_9OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -384,10 +384,10 @@ class ItemGoldBar10oz: CA_Magazine {
 	count = 1;
 	worth = 1000;
 	type = 256;
-	displayName = "10oz Gold";
+	displayName = $STR_EPOCH_10OZGOLD;
 	model = "\z\addons\dayz_epoch\models\ItemGoldBar10oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_10oz_CA.paa";
-	descriptionShort = "10 x 1oz Gold Bar";
+	descriptionShort = $STR_EPOCH_10OZGOLD_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_211_1;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/SilverBar.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/SilverBar.hpp
@@ -3,10 +3,10 @@ class ItemSilverBar: CA_Magazine {
 	count = 1;
 	worth = 1;
 	type = 256;
-	displayName = "Silver";
+	displayName = $STR_EPOCH_SILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar1oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "Silver Bar";
+	descriptionShort = $STR_EPOCH_SILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -32,10 +32,10 @@ class ItemSilverBar2oz: CA_Magazine {
 	count = 1;
 	worth = 2;
 	type = 256;
-	displayName = "2oz Silver";
+	displayName = $STR_EPOCH_2OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar2oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "2 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_2OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -70,10 +70,10 @@ class ItemSilverBar3oz: CA_Magazine {
 	count = 1;
 	worth = 3;
 	type = 256;
-	displayName = "3oz Silver";
+	displayName = $STR_EPOCH_3OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar3oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "3 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_3OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -116,10 +116,10 @@ class ItemSilverBar4oz: CA_Magazine {
 	count = 1;
 	worth = 4;
 	type = 256;
-	displayName = "4oz Silver";
+	displayName = $STR_EPOCH_4OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar4oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "4 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_4OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -162,10 +162,10 @@ class ItemSilverBar5oz: CA_Magazine {
 	count = 1;
 	worth = 5;
 	type = 256;
-	displayName = "5oz Silver";
+	displayName = $STR_EPOCH_5OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar5oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "5 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_5OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -208,10 +208,10 @@ class ItemSilverBar6oz: CA_Magazine {
 	count = 1;
 	worth = 6;
 	type = 256;
-	displayName = "6oz Silver";
+	displayName = $STR_EPOCH_6OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar6oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "6 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_6OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -254,10 +254,10 @@ class ItemSilverBar7oz: CA_Magazine {
 	count = 1;
 	worth = 7;
 	type = 256;
-	displayName = "7oz Silver";
+	displayName = $STR_EPOCH_7OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar7oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "7 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_7OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -300,10 +300,10 @@ class ItemSilverBar8oz: CA_Magazine {
 	count = 1;
 	worth = 8;
 	type = 256;
-	displayName = "8oz Silver";
+	displayName = $STR_EPOCH_8OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar8oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "8 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_8OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -346,10 +346,10 @@ class ItemSilverBar9oz: CA_Magazine {
 	count = 1;
 	worth = 9;
 	type = 256;
-	displayName = "9oz Silver";
+	displayName = $STR_EPOCH_9OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar9oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
-	descriptionShort = "9 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_9OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_210_1;
@@ -384,10 +384,10 @@ class ItemSilverBar10oz: CA_Magazine {
 	count = 1;
 	worth = 10;
 	type = 256;
-	displayName = "10oz Silver";
+	displayName = $STR_EPOCH_10OZSILVER;
 	model = "\z\addons\dayz_epoch\models\ItemSilverBar10oz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_Silver_bar_10oz_CA.paa";
-	descriptionShort = "10 x 1oz Silver Bar";
+	descriptionShort = $STR_EPOCH_10OZSILVER_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_211_1;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/TinBar.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/TinBar.hpp
@@ -2,20 +2,20 @@ class ItemTinBar: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Tin";
+	displayName = $STR_EPOCH_TIN;
 	model = "\z\addons\dayz_epoch\models\tin_bar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_CA.paa";
-	descriptionShort = "Tin Bar";
+	descriptionShort = $STR_EPOCH_TIN_DESC;

 };
 class ItemTinBar10oz: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "10oz Tin";
+	displayName = $STR_EPOCH_10OZTIN;
 	model = "\z\addons\dayz_epoch\models\tin_bar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_10oz_CA.paa";
-	descriptionShort = "10oz Tin Bar";
+	descriptionShort = $STR_EPOCH_10OZTIN_DESC;
 	class ItemActions {
 		class Crafting {
 			text = $STR_EPOCH_PLAYER_211;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp
@@ -1,9 +1,9 @@
 class FoodBioMeat: FoodEdible {
 	scope = public;
-	displayName = "Bio Meat";
+	displayName = $STR_FOOD_NAME_BIOMEAT;
 	model = "\z\addons\dayz_epoch\models\biomeat_can.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_biomeat_CA.paa";
-	descriptionShort = "Bio Meat: A very good source of nutrition, and a very high chance of infection. Eat at own risk.";
+	descriptionShort = $STR_FOOD_NAME_BIOMEAT_DESC;
 	bloodRegen = 1600;
 };
 // new DZE harvested food
@@ -11,8 +11,8 @@ class FoodPumpkin : FoodEdible {
 	scope = public;
 	count = 1;
 	bloodRegen = 100;
-	displayName = "Pumpkin";
-	descriptionShort = "Pumpkin";
+	displayName = $STR_FOOD_NAME_PUMPKIN;
+	descriptionShort = $STR_FOOD_NAME_PUMPKIN;
 	weight = 1;
 	model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
@@ -20,7 +20,7 @@ class FoodPumpkin : FoodEdible {
 	{
 		class Crafting
 		{
-		text = "Craft Pumpkin Seeds";
+		text = $STR_FOOD_NAME_PUMPKIN_CRAFT;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
@@ -33,8 +33,8 @@ class FoodSunFlowerSeed : FoodEdible {
 	scope = public;
 	count = 1;
 	bloodRegen = 100;
-	displayName = "Bag of Sunflower Seeds";
-	descriptionShort = "Bag of Sunflower Seeds";
+	displayName = $STR_FOOD_NAME_SUNFLOWER;
+	descriptionShort = $STR_FOOD_NAME_SUNFLOWER;
 	weight = 0.1;
 	model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Gems.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Gems.hpp
@@ -1,63 +1,63 @@
 class ItemTopaz : CA_Magazine {
 	scope = public;
-	displayName = "Topaz";
+	displayName = $STR_GEM_NAME_TOPAZ;
 	model = "\z\addons\dayz_epoch\models\topaz.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_topaz_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Topaz";
+	descriptionShort = $STR_GEM_NAME_TOPAZ;
 };
 class ItemObsidian : CA_Magazine {
 	scope = public;
-	displayName = "Obsidian";
+	displayName = $STR_GEM_NAME_OBSIDIAN;
 	model = "\z\addons\dayz_epoch\models\obsidian.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_obsidian_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Obsidian";
+	descriptionShort = $STR_GEM_NAME_OBSIDIAN;
 };
 class ItemSapphire : CA_Magazine {
 	scope = public;
-	displayName = "Sapphire";
+	displayName = $STR_GEM_NAME_SAPPHIRE;
 	model = "\z\addons\dayz_epoch\models\sapphire.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_sapphire_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Sapphire";
+	descriptionShort = $STR_GEM_NAME_SAPPHIRE;
 };
 class ItemAmethyst : CA_Magazine {
 	scope = public;
-	displayName = "Amethyst";
+	displayName = $STR_GEM_NAME_AMETHYST;
 	model = "\z\addons\dayz_epoch\models\amethyst.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_amethyst_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Amethyst";
+	descriptionShort = $STR_GEM_NAME_AMETHYST;
 };
 class ItemEmerald : CA_Magazine {
 	scope = public;
-	displayName = "Emerald";
+	displayName = $STR_GEM_NAME_EMERALD;
 	model = "\z\addons\dayz_epoch\models\emerald.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_emerald_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Emerald";
+	descriptionShort = $STR_GEM_NAME_EMERALD;
 };
 class ItemCitrine : CA_Magazine {
 	scope = public;
-	displayName = "Citrine";
+	displayName = $STR_GEM_NAME_CITRINE;
 	model = "\z\addons\dayz_epoch\models\citrine.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_citrine_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Citrine";
+	descriptionShort = $STR_GEM_NAME_CITRINE;
 };
 class ItemRuby : CA_Magazine {
 	scope = public;
-	displayName = "Ruby";
+	displayName = $STR_GEM_NAME_RUBY;
 	model = "\z\addons\dayz_epoch\models\ruby.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_ruby_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "Ruby";
+	descriptionShort = $STR_GEM_NAME_RUBY;
 };
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
@@ -1,9 +1,26 @@
 class ItemWaterbottle1oz : ItemWaterbottle {
-	displayName = "Water Bottle (1oz)";
-	descriptionShort = "Watter Bottle with 1oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE1OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE1OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
 	wateroz = 1;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,100,0};
+	infectionChance = 0.03;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
@@ -11,71 +28,178 @@ class ItemWaterbottle1oz : ItemWaterbottle {
 	};
 };
 class ItemWaterbottle2oz : ItemWaterbottle {
-	displayName = "Water Bottle (2oz)";
-	descriptionShort = "Watter Bottle with 2oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE2OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE2OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
 	wateroz = 2;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,200,0};
+	infectionChance = 0.06;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
 		};
 	};
+
 };
 class ItemWaterbottle3oz : ItemWaterbottle {
-	displayName = "Water Bottle (3oz)";
-	descriptionShort = "Watter Bottle with 3oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE3OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE3OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
 	wateroz = 3;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,300,0};
+	infectionChance = 0.09;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
 		};
 	};
+
 };
 class ItemWaterbottle4oz : ItemWaterbottle {
-	displayName = "Water Bottle (4oz)";
-	descriptionShort = "Watter Bottle with 4oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE4OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE4OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
 	wateroz = 4;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,400,0};
+	infectionChance = 0.12;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
 		};
 	};
+
 };
 class ItemWaterbottle5oz : ItemWaterbottle {
-	displayName = "Water Bottle (5oz)";
-	descriptionShort = "Watter Bottle with 5oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE5OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE5OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
 	wateroz = 5;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,500,0};
+	infectionChance = 0.15;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
 		};
 	};
+
 };
 class ItemWaterbottle6oz : ItemWaterbottle {
-	displayName = "Water Bottle (6oz)";
-	descriptionShort = "Watter Bottle with 6oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE6OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE6OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
 	wateroz = 6;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,600,0};
+	infectionChance = 0.18;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
 		};
 	};
+
 };
 class ItemWaterbottle7oz : ItemWaterbottle {
-	displayName = "Water Bottle (7oz)";
-	descriptionShort = "Watter Bottle with 7oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE7OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE7OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
 	wateroz = 7;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,700,0};
+	infectionChance = 0.21;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
@@ -83,23 +207,58 @@ class ItemWaterbottle7oz : ItemWaterbottle {
 	};
 };
 class ItemWaterbottle8oz : ItemWaterbottle {
-	displayName = "Water Bottle (8oz)";
-	descriptionShort = "Watter Bottle with 8oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE8OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE8OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
 	wateroz = 8;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,800,0};
+	infectionChance = 0.24;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
 		};
 	};
+
 };
 class ItemWaterbottle9oz : ItemWaterbottle {
-	displayName = "Water Bottle (9oz)";
-	descriptionShort = "Watter Bottle with 9oz of water";
+	displayName = $STR_EPOCH_WATERBOTTLE9OZ;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE9OZ_DESC;
 	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
 	wateroz = 9;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,900,0};
+	infectionChance = 0.27;
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
 	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
 		class Fill {
 			text = "$STR_ACTIONS_FILL_W";
 			script = "spawn player_fillWater;";
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
@@ -1,16 +1,16 @@
 // For Chainsaw
 class ItemMixOil : CA_Magazine {
 	scope = public;
-	displayName = "2-Stroke Engine Oil";
+	displayName = $STR_EPOCH_CHAINSAW_OIL;
 	model = "\z\addons\dayz_epoch\models\oilmix.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_oilmix_CA.paa";
 	count = 1;
 	type = "256";
-	descriptionShort = "2-Stroke Engine Oil";
+	descriptionShort = $STR_EPOCH_CHAINSAW_OIL;
 	sfx = "refuel";
 	class ItemActions {
 		class Crafting {
-			text = "Mix Chainsaw Gas"; // TODO: localize
+			text = $STR_EPOCH_CHAINSAW_MIXGAS_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {};
@@ -23,8 +23,8 @@ class ItemMixOil : CA_Magazine {
 class CSGAS : CA_Magazine {
 	scope = public;
 	type = VSoft;
-	displayName = "Gas";
-	descriptionShort = "Gas for Chainsaw";
+	displayName = $STR_EPOCH_CHAINSAW_GAS;
+	descriptionShort = $STR_EPOCH_CHAINSAW_GAS_DESC;
 	count = 1000;
 	picture = "\CA\weapons\data\equip\m_m240_ca.paa";
 	ammo = "Chainsaw_Swing_Ammo";
@@ -65,14 +65,14 @@ class ItemJerryMixed: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Mixed Gas Full";
+	displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS20L_CAN;
 	model = "\dayz_equip\models\jerrycan.p3d";
 	picture = "\dayz_equip\textures\equip_jerrycan_ca.paa";
-	descriptionShort = "20 liters of Mixed Gas.";
+	descriptionShort = $STR_EPOCH_CHAINSAW_MIXEDGAS20L_CAN_DESC;
 	sfx = "refuel";
 	class ItemActions {
 		class Crafting {
-			text = "Fill Chainsaw";
+			text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
@@ -85,14 +85,14 @@ class ItemJerryMixed4: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Mixed Gas 16L";
+	displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS16L_CAN;
 	model = "\dayz_equip\models\jerrycan.p3d";
 	picture = "\dayz_equip\textures\equip_jerrycan_ca.paa";
-	descriptionShort = "16 liters of Mixed Gas.";
+	descriptionShort = $STR_EPOCH_CHAINSAW_MIXEDGAS16L_CAN_DESC;
 	sfx = "refuel";
 	class ItemActions {
 		class Crafting {
-			text = "Fill Chainsaw";
+			text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
@@ -105,14 +105,14 @@ class ItemJerryMixed3: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Mixed Gas 12L";
+	displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS12L_CAN;
 	model = "\dayz_equip\models\jerrycan.p3d";
 	picture = "\dayz_equip\textures\equip_jerrycan_ca.paa";
-	descriptionShort = "12 liters of Mixed Gas.";
+	descriptionShort = $STR_EPOCH_CHAINSAW_MIXEDGAS12L_CAN_DESC;
 	sfx = "refuel";
 	class ItemActions {
 		class Crafting {
-			text = "Fill Chainsaw";
+			text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
@@ -125,14 +125,14 @@ class ItemJerryMixed2: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Mixed Gas 8L";
+	displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS8L_CAN;
 	model = "\dayz_equip\models\jerrycan.p3d";
 	picture = "\dayz_equip\textures\equip_jerrycan_ca.paa";
-	descriptionShort = "8 liters of Mixed Gas.";
+	descriptionShort = $STR_EPOCH_CHAINSAW_MIXEDGAS8L_CAN_DESC;
 	sfx = "refuel";
 	class ItemActions {
 		class Crafting {
-			text = "Fill Chainsaw";
+			text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
@@ -145,14 +145,14 @@ class ItemJerryMixed1: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Mixed Gas 4L";
+	displayName = $STR_EPOCH_CHAINSAW_MIXEDGAS4L_CAN;
 	model = "\dayz_equip\models\jerrycan.p3d";
 	picture = "\dayz_equip\textures\equip_jerrycan_ca.paa";
-	descriptionShort = "4 liters of Mixed Gas.";
+	descriptionShort = $STR_EPOCH_CHAINSAW_MIXEDGAS4L_CAN;
 	sfx = "refuel";
 	class ItemActions {
 		class Crafting {
-			text = "Fill Chainsaw";
+			text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
@@ -254,10 +254,10 @@ class ItemDocument: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Document";
+	displayName = $STR_EPOCH_DOCUMENT;
 	model = "\z\addons\dayz_epoch\models\doc_generic.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa";
-	descriptionShort = "Unknown document";
+	descriptionShort = $STR_EPOCH_DOCUMENT_DESC;
 	weight = 0.1;
 	sfx = "document";
 	class ItemActions {
@@ -276,19 +276,19 @@ class ItemPlotDeed: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Plot Deed"; // TODO: localize
+	displayName = $STR_EPOCH_PLOTDEED;
 	model = "\z\addons\dayz_epoch\models\doc_generic.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_doc_generic_ca.paa";
-	descriptionShort = "Deed to a plot of land, similar to a plot pole."; // TODO: localize
+	descriptionShort = $STR_EPOCH_PLOTDEED_DESC;
 	weight = 0.1;
 	sfx = "document";
 	class ItemActions {
 		class Crafting {
-			text = "Craft Plot Pole";
+			text = $STR_EPOCH_PLOTDEED_ACTION;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
-			output[] = {{"30m_plot_kit",1}};
+			output[] = {{"plot_pole_kit",1}};
 			input[] = {{"ItemPlotDeed",1},{"ItemGoldBar10oz",2}};
 		};
 	};
@@ -297,66 +297,65 @@ class ItemLetter: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Letter";
+	displayName = $STR_EPOCH_LETTER;
 	model = "\z\addons\dayz_epoch\models\doc_letter.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_doc_letter_ca.paa";
-	descriptionShort = "Random letter";
+	descriptionShort = $STR_EPOCH_LETTER_DESC;
 	weight = 0.1;
 };
 class ItemBook1: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Romance Novel";
+	displayName = $STR_EPOCH_ROMANCENOVEL;
 	model = "\z\addons\dayz_epoch\models\doc_trashy1.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_trashy1_ca.paa";
-	descriptionShort = "Trashy Romance Novel - ""The seas are laden with lust and jealousy.""";
+	descriptionShort = $STR_EPOCH_ROMANCENOVEL_DESC;
 	weight = 0.1;
 };
 class ItemBook2: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Romance Novel";
+	displayName = $STR_EPOCH_ROMANCENOVEL;
 	model = "\z\addons\dayz_epoch\models\doc_trashy2.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_trashy2_ca.paa";
-	descriptionShort = "Trashy Romance Novel - ""He had a chest of iron, and a heart of gold.""";
+	descriptionShort = $STR_EPOCH_ROMANCENOVEL_DESC2;
 	weight = 0.1;
 };
 class ItemBook3: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Book";
+	displayName = $STR_EPOCH_BOOK;
 	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
-	descriptionShort = "Random Children's Book";
+	descriptionShort = $STR_EPOCH_BOOK_DESC;
 	weight = 0.1;
 };
 class ItemBook4: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Book";
+	displayName = $STR_EPOCH_BOOK;
 	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";
-	descriptionShort = "Random Children's Book";
+	descriptionShort = $STR_EPOCH_BOOK_DESC;
 	weight = 0.1;
 };
 class ItemNewspaper: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Torn Newspaper";
+	displayName = $STR_EPOCH_TORNNEWSPAPER;
 	model = "\z\addons\dayz_epoch\models\doc_deaths.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_deaths_ca.paa";
-	descriptionShort = "Torn Newspaper - ""The recent obituaries are stil legible...""";
+	descriptionShort = $STR_EPOCH_TORNNEWSPAPER_DESC;
 	weight = 0.1;
 	class ItemActions {
 		class Obituaries {
-			text = "Read Obituaries"; // TODO: localize
+			text = $STR_EPOCH_TORNNEWSPAPER_ACTION;
 			script = "spawn player_deathBoard;";
-
 		};
 	};
 };
@@ -364,10 +363,10 @@ class ItemDocumentRamp: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Ramp";
+	displayName = $STR_EPOCH_WOODRAMP;
 	model = "\z\addons\dayz_epoch\models\doc_ramp.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_doc_ramp_ca.paa";
-	descriptionShort = "Document used in building a wooden ramp.";
+	descriptionShort = $STR_EPOCH_WOODRAMP_DESC;
 	weight = 0.1;
 	class ItemActions {
 		class Crafting {
@@ -385,10 +384,10 @@ class ItemHotwireKit: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Hotwire kit";
+	displayName = $STR_EPOCH_HOTWIREKIT;
 	model = "\z\addons\dayz_epoch\models\hotwire.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa";
-	descriptionShort = "Used to temporarily unlock and start a vehicle has a chance of failure and is consumed on use.";
+	descriptionShort = $STR_EPOCH_HOTWIREKIT_DESC;
 	weight = 2;
 };

@@ -403,8 +402,8 @@ class ItemBloodbag: CA_Magazine
 	descriptionShort = "$STR_EQUIP_DESC_16";
 	class ItemActions {
 		class use {
-			text = "Self transfusion";
+			text = $STR_EPOCH_BLOODBAG_ACTION;
 			script = "spawn player_useMeds;";
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
@@ -3,16 +3,16 @@ class ItemCanvas: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Canvas";
+	displayName = $STR_EPOCH_CANVAS;
 	model = "\z\addons\dayz_epoch\models\canvas.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_canvas_ca.paa";
-	descriptionShort = "Canvas Parcel";
+	descriptionShort = $STR_EPOCH_CANVAS_DESC;
 	class ItemActions
 	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_190;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemTent",1}};
@@ -21,7 +21,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_191;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemDesertTent",1}};
@@ -30,7 +30,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_192;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemDomeTent",1}};
@@ -39,7 +39,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_193;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"sun_shade_kit",1}};
@@ -48,7 +48,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting4
 		{
 			text = $STR_EPOCH_PLAYER_194;
-			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemBurlap",1}};
@@ -61,16 +61,16 @@ class ItemBurlap: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Burlap";
+	displayName = $STR_EPOCH_BURLAP;
 	model = "\z\addons\dayz_epoch\models\burlap.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_burlap_ca.paa";
-	descriptionShort = "Burlap: A strong cloth like material used for building sandbags";
+	descriptionShort = $STR_EPOCH_BURLAP_DESC;
 	class ItemActions
 	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_195;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sand"}; // todo add sand requirement
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbag",1}};
@@ -83,15 +83,16 @@ class ItemLightBulb: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Light Bulb";
+	displayName = $STR_EPOCH_LIGHTBULB;
 	model = "\z\addons\dayz_epoch\models\bulb.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_bulb_CA.paa";
-	descriptionShort = "Lightbulb: Used in part to create a buildable lamp post. Don't tell me you didn't find this in a barn.";
-	class ItemActions {
+	descriptionShort = $STR_EPOCH_LIGHTBULB_DESC;
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_196;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"light_pole_kit",1}};
@@ -107,10 +108,10 @@ class ItemZombieParts: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Zombie Parts";
+	displayName = $STR_EPOCH_ZOMBIEPARTS;
 	model = "\z\addons\dayz_epoch\models\zombie_parts_bag_v2.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_zparts_CA.paa";
-	descriptionShort = "Zombie Parts in a Bag: Trade these for Bio Meat at medic traders.";
+	descriptionShort = $STR_EPOCH_ZOMBIEPARTS_DESC;
 };

 class ItemComboLock: CA_Magazine
@@ -118,11 +119,11 @@ class ItemComboLock: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Combination Lock";
+	displayName = $STR_EPOCH_COMBINATIONLOCK;
 	weight = 0.5;
 	model = "\z\addons\dayz_epoch\models\combo_lock_mag.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_combolock_ca.paa";
-	descriptionShort = "Used to secure structures from unauthorized entry.";
+	descriptionShort = $STR_EPOCH_COMBINATIONLOCK_DESC;

 };

@@ -131,11 +132,12 @@ class ItemCorrugated : CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Corrugated Fence";
+	displayName = $STR_EPOCH_CORRUGATEDFENCE;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Corrugated Fence: A buildable object used for fortification purposes.";
-	class ItemActions {
+	descriptionShort = $STR_EPOCH_CORRUGATEDFENCE_DESC;
+	class ItemActions
+	{
 		class Build {
 			text = $STR_EPOCH_PLAYER_214;
 			script = "spawn player_build;";
@@ -145,7 +147,7 @@ class ItemCorrugated : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_215;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"wooden_shed_kit",1}};
@@ -154,7 +156,7 @@ class ItemCorrugated : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_217;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"outhouse_kit",1}};
@@ -163,7 +165,7 @@ class ItemCorrugated : CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_216;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"storage_shed_kit",1}};
@@ -176,15 +178,16 @@ class ItemPole: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Metal Pole";
+	displayName = $STR_EPOCH_METALPOLE;
 	model = "\z\addons\dayz_epoch\models\pipe.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_pipe_CA.paa";
-	descriptionShort = "Pole: A few sturdy metal poles used to craft tents and other buildables";
-	class ItemActions {
+	descriptionShort = $STR_EPOCH_METALPOLE_DESC;
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_218;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"fire"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemCorrugated",1}};
@@ -193,7 +196,7 @@ class ItemPole: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_219;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"rusty_gate_kit",1}};
@@ -202,7 +205,7 @@ class ItemPole: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_220;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"metal_panel_kit",1}};
@@ -211,7 +214,7 @@ class ItemPole: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_305;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemScaffoldingKit",1}};
@@ -224,8 +227,8 @@ class ItemGunRackKit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Gun Rack Kit";
-	descriptionShort = "A Gun Rack for 20 weapons";
+	displayName = $STR_EPOCH_GUNRACKKIT;
+	descriptionShort = $STR_EPOCH_GUNRACKKIT_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 20;
@@ -245,8 +248,8 @@ class ItemWoodCrateKit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Crate";
-	descriptionShort = "A wood crate that holds a lot of items.";
+	displayName = $STR_EPOCH_WOODCRATE;
+	descriptionShort = $STR_EPOCH_WOODCRATE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 20;
@@ -267,10 +270,10 @@ class ItemOilBarrel: CA_Magazine
 	count = 1;
 	// fuelQuantity = 210;
 	type = 256;
-	displayName = "Oil Barrel";
+	displayName = $STR_EPOCH_OILBARREL;
 	model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa";
-	descriptionShort = "210 litres of Oil in a Barrel";
+	descriptionShort = $STR_EPOCH_OILBARREL_DESC;
 };
 class ItemFuelBarrel: CA_Magazine
 {
@@ -278,10 +281,10 @@ class ItemFuelBarrel: CA_Magazine
 	count = 1;
 	fuelQuantity = 210;
 	type = 256;
-	displayName = "Fuel Barrel";
+	displayName = $STR_EPOCH_FUELBARREL;
 	model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa";
-	descriptionShort = "210 litres of fuel per barrel";
+	descriptionShort = $STR_EPOCH_FUELBARREL_DESC;
 	fireIntensity = 6; //used for tent burning
 	emptycan = "ItemFuelBarrelEmpty";
 };
@@ -291,15 +294,16 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel
 	count = 1;
 	fuelQuantity = 0;
 	type = 256;
-	displayName = "Fuel Barrel (Empty)";
+	displayName = $STR_EPOCH_EMPTYFUELBARREL;
 	picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa";
-	descriptionShort = "210 litres of fuel per barrel (Empty)";
+	descriptionShort = $STR_EPOCH_EMPTYFUELBARREL_DESC;
 	fullcan = "ItemFuelBarrel";
-	class ItemActions {
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_276;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox","ItemMatchbox"};
 			output[] = {{"ItemFireBarrel_kit",1}};
@@ -309,32 +313,32 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel
 };
 class ItemFireBarrel_kit: CA_Magazine
 {
-		scope = public;
-		count = 1;
-		type = 256;
-		displayName = "Fire Barrel Kit";
-		descriptionShort = "Fire Barrel";
-		model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-		picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-		weight = 45;
-		class ItemActions
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_FIREBARRELKIT;
+	descriptionShort = $STR_EPOCH_FIREBARRELKIT_DESC;
+	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	weight = 45;
+	class ItemActions
+	{
+		class Build
 		{
-			class Build
-			{
-				text = $STR_ACTIONS_BUILD;
-				script = "spawn player_build;";
-				require[] = {"ItemToolbox"};
-				create = "FireBarrel_DZ";
-			};
+			text = $STR_ACTIONS_BUILD;
+			script = "spawn player_build;";
+			require[] = {"ItemToolbox"};
+			create = "FireBarrel_DZ";
 		};
+	};
 };
 class workbench_kit: CA_Magazine
 {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Workbench";
-	descriptionShort = "Workbench: Used to craft.";
+	displayName = $STR_EPOCH_WORKBENCH;
+	descriptionShort = $STR_EPOCH_WORKBENCH_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 10;
@@ -356,8 +360,8 @@ class wood_ramp_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Ramp";
-	descriptionShort = "Wood ramp can be used to get air.";
+	displayName = $STR_EPOCH_WOODRAMP;
+	descriptionShort = $STR_EPOCH_WOODENRAMP_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	class ItemActions
@@ -371,13 +375,13 @@ class wood_ramp_kit: CA_Magazine
 		};
 	};
 };
-class 30m_plot_kit: CA_Magazine
+class plot_pole_kit: CA_Magazine
 {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "30 Meter Plot";
-	descriptionShort = "Plot Pole: A placeable pole that will allow you and your friends to build within a 30m radius. Ownership of plot pole is lost after owners death.";
+	displayName = $STR_EPOCH_PLAYER_246;
+	descriptionShort = $STR_EPOCH_PLOT_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	class ItemActions
@@ -397,8 +401,8 @@ class metal_panel_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Metal Panel";
-	descriptionShort = "Metal Panel: Strong metal wall used for base defence.";
+	displayName = $STR_EPOCH_METALPANEL;
+	descriptionShort = $STR_EPOCH_METALPANEL_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 50;
@@ -414,7 +418,7 @@ class metal_panel_kit: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_228;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop","fire"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar","ItemSledge"};
 			output[] = {{"metal_floor_kit",1}};
@@ -427,8 +431,8 @@ class deer_stand_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Deer Stand";
-	descriptionShort = "Deer Stand: can be used as a lookout.";
+	displayName = $STR_EPOCH_DEERSTAND;
+	descriptionShort = $STR_EPOCH_DEERSTAND_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -448,10 +452,10 @@ class desert_large_net_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Desert Camo Net";
-	descriptionShort = "Large Camo Netting: A very large buildable object that can be used to cover objects.";
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	displayName = $STR_EPOCH_LARGEDESERTCAMONET;
+	descriptionShort = $STR_EPOCH_LARGECAMONET_DESC;
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -469,10 +473,10 @@ class forest_large_net_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Forest Camo Net";
-	descriptionShort = "Large Camo Netting: A very large buildable object that can be used to cover objects.";
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	displayName = $STR_EPOCH_LARGEFORESTCAMONET;
+	descriptionShort = $STR_EPOCH_LARGECAMONET_DESC;
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -490,10 +494,10 @@ class desert_net_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Desert Camo Net";
-	descriptionShort = "Camo Netting: A buildable object that can be used to cover objects.";
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	displayName = $STR_EPOCH_DESERTCAMONET;
+	descriptionShort = $STR_EPOCH_CAMONET_DESC;
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -507,7 +511,7 @@ class desert_net_kit: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_229;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_large_net_kit",1}};
@@ -520,10 +524,10 @@ class forest_net_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Forest Camo Net";
-	descriptionShort = "Camo Netting: A buildable object that can be used to cover objects.";
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	displayName = $STR_EPOCH_FORESTCAMONET;
+	descriptionShort = $STR_EPOCH_CAMONET_DESC;
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -537,7 +541,7 @@ class forest_net_kit: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_229;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_large_net_kit",1}};
@@ -550,8 +554,8 @@ class fuel_pump_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Fuel Pump";
-	descriptionShort = "Fuel Pump";
+	displayName = $STR_EPOCH_FUELPUMP;
+	descriptionShort = $STR_EPOCH_FUELPUMP;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 50;
@@ -571,8 +575,8 @@ class light_pole_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Light Pole";
-	descriptionShort = "Light Pole: A buildable object that can be used with a Generator to provide light in times of darkness.";
+	displayName = $STR_EPOCH_LIGHTPOLE;
+	descriptionShort = $STR_EPOCH_LIGHTPOLE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -592,8 +596,8 @@ class stick_fence_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Stick Fence";
-	descriptionShort = "Stick Fence: A buildable barrier that can be used to keep zombies out of your camp. They are fairly weak and can be ran over easier.";
+	displayName = $STR_EPOCH_STICKFENCE;
+	descriptionShort = $STR_EPOCH_STICKFENCE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 15;
@@ -613,8 +617,8 @@ class wooden_shed_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Nice Wooden Shed";
-	descriptionShort = "Nice Wooden Shed: A crafted object that holds a lot of items/weapons/backpacks and has a door that opens and closes.";
+	displayName = $STR_EPOCH_NICEWOODSHED;
+	descriptionShort = $STR_EPOCH_NICEWOODSHED_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -634,8 +638,8 @@ class wood_shack_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Shack";
-	descriptionShort = "Wood Shack";
+	displayName = $STR_EPOCH_WOODSHACK;
+	descriptionShort = $STR_EPOCH_WOODSHACK;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -655,8 +659,8 @@ class m240_nest_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "M240 Nest";
-	descriptionShort = "M240 Nest";
+	displayName = $STR_EPOCH_M240NEST;
+	descriptionShort = $STR_EPOCH_M240NEST;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 125;
@@ -676,8 +680,8 @@ class sun_shade_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Canvas Sun Shade";
-	descriptionShort = "Sun Shade: A buildable object used to keep the sun off your back.";
+	displayName = $STR_EPOCH_CANVASSUNSHADE;
+	descriptionShort = $STR_EPOCH_CANVASSUNSHADE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -697,8 +701,8 @@ class park_bench_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Bench";
-	descriptionShort = "Wood Bench";
+	displayName = $STR_EPOCH_WOODBENCH;
+	descriptionShort = $STR_EPOCH_WOODBENCH;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -718,8 +722,8 @@ class rusty_gate_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Rusty Gate";
-	descriptionShort = "Rusty Gate: A buildable object that can be opened and closed.";
+	displayName = $STR_EPOCH_RUSTYGATE;
+	descriptionShort = $STR_EPOCH_RUSTYGATE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -739,8 +743,8 @@ class outhouse_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Outhouse";
-	descriptionShort = "Outhouse: A buildable object that you can poop in. Comes pre-stocked with one roll of Toilet Paper.";
+	displayName = $STR_EPOCH_OUTHOUSE;
+	descriptionShort = $STR_EPOCH_OUTHOUSE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 25;
@@ -760,8 +764,8 @@ class storage_shed_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Storage Shed";
-	descriptionShort = "Storage Shed: A large buildable object that is non enterable and holds a lot of items/weapons/backpacks";
+	displayName = $STR_EPOCH_STORAGESHED;
+	descriptionShort = $STR_EPOCH_STORAGESHED_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 75;
@@ -782,8 +786,8 @@ class ItemScaffoldingKit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Scaffolding";
-	descriptionShort = "";
+	displayName = $STR_EPOCH_SCAFFOLDING;
+	descriptionShort = $STR_EPOCH_SCAFFOLDING;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 80;
@@ -810,7 +814,8 @@ class ItemVault: CA_Magazine
 	descriptionShort = $STR_EPOCH_SAFE_DESC;
 	class ItemActions
 	{
-		class Build {
+		class Build
+		{
 			text = $STR_EPOCH_PLAYER_230;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
@@ -823,14 +828,15 @@ class ItemLockbox: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Lockbox";
+	displayName = $STR_EPOCH_LOCKBOX;
 	model = "\z\addons\dayz_epoch\models\lockbox_mag.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_lockbox_CA.paa";
-	descriptionShort = "Semi secure lockbox";
+	descriptionShort = $STR_EPOCH_LOCKBOX_DESC;
 	weight = 15;
 	class ItemActions
 	{
-		class Build {
+		class Build
+		{
 			text = $STR_EPOCH_PLAYER_231;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
@@ -838,22 +844,22 @@ class ItemLockbox: CA_Magazine
 		};
 	};
 };
-
 class PartPlankPack: CA_Magazine
 {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Lumber Pack";
+	displayName = $STR_EPOCH_LUMBERPACK;
 	model = "\z\addons\dayz_epoch\models\plank_pack.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_lumber_pack_CA.paa";
-	descriptionShort = "Lumber in a stack";
+	descriptionShort = $STR_EPOCH_LUMBERPACK_DESC;
 	weight = 6;
-	class ItemActions {
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_251;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"PartWoodLumber",3}};
@@ -866,25 +872,26 @@ class CinderBlocks: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Cinder Blocks";
+	displayName = $STR_EPOCH_CINDERBLOCKS;
 	model = "\z\addons\dayz_epoch\models\cinder_stack.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\epuip_cinder_blocks_CA.paa";
-	descriptionShort = "Stack of nine cinder blocks";
+	descriptionShort = $STR_EPOCH_CINDERBLOCKS_DESC;
 	weight = 100;
-	class ItemActions {
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_252;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
-			output[] = {{"cinder_wall_kit",1}};
+			output[] = {{"half_cinder_wall_kit",1}};
 			input[] = {{"CinderBlocks",3},{"MortarBucket",1}};
 		};
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_253;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"cinder_garage_kit",1}};
@@ -893,14 +900,21 @@ class CinderBlocks: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_234;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"cinder_door_kit",1}};
 			input[] = {{"CinderBlocks",4},{"MortarBucket",1},{"ItemTankTrap",1}};
 		};
-
-
+		class Crafting3
+		{
+			text = $STR_EPOCH_PLAYER_252_1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"workshop"};
+			requiretools[] = {"ItemToolbox"};
+			output[] = {{"full_cinder_wall_kit",1}};
+			input[] = {{"CinderBlocks",7},{"MortarBucket",2}};
+		};
 	};
 };
 class MortarBucket: CA_Magazine
@@ -908,10 +922,10 @@ class MortarBucket: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Bucket of Mortar";
+	displayName = $STR_EPOCH_BUCKETOFMORTAR;
 	model = "\z\addons\dayz_epoch\models\mortar.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_mortar_CA.paa";
-	descriptionShort = "Premixed mastic adhesive that will bond to concrete block.";
+	descriptionShort = $STR_EPOCH_BUCKETOFMORTAR_DESC;
 	weight = 21;
 };
 class PartPlywoodPack: CA_Magazine
@@ -919,22 +933,22 @@ class PartPlywoodPack: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Plywood Pack";
+	displayName = $STR_EPOCH_PLYWOODPACK;
 	model = "\z\addons\dayz_epoch\models\plywood_pack.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_plywood_pack_CA.paa";
-	descriptionShort = "Plywood in a stack";
+	descriptionShort = $STR_EPOCH_PLYWOODPACK_DESC;
 	weight = 12;
-	class ItemActions {
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_251;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"PartWoodPlywood",3}};
 			input[] = {{"PartPlywoodPack",1}};
 		};
-
 	};
 };
 class PartWoodLumber: CA_Magazine
@@ -942,15 +956,16 @@ class PartWoodLumber: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Lumber";
+	displayName = $STR_EPOCH_LUMBER;
 	model = "\z\addons\dayz_epoch\models\planks.p3d";
-	picture="\z\addons\dayz_epoch\pictures\equip_wood_planks_CA.paa";
-	descriptionShort = "Lumber: Used for building many structures and can also be used to make plywood.";
-	class ItemActions {
+	picture= "\z\addons\dayz_epoch\pictures\equip_wood_planks_CA.paa";
+	descriptionShort = $STR_EPOCH_LUMBER_DESC;
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_254;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"PartWoodPlywood",1}};
@@ -960,7 +975,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_255;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"bulk_empty",1}};
@@ -970,18 +985,17 @@ class PartWoodLumber: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_256;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"deer_stand_kit",1}};
 			input[] = {{"PartWoodLumber",8},{"PartWoodPile",2}};

 		};
-
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_257;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodStairs",1}};
@@ -991,7 +1005,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting4
 		{
 			text = $STR_EPOCH_PLAYER_258;
-			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodLadder",1}};
@@ -999,27 +1013,27 @@ class PartWoodLumber: CA_Magazine

 		};
 		class Crafting5
-			{
-				text = $STR_EPOCH_PLAYER_259;
-				Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-				neednearby[] = {"sawmill"};
-				requiretools[] = {"ItemToolbox"};
-				output[] = {{"PartPlankPack",1}};
-				input[] = {{"PartWoodLumber",3}};
-			};
-			class Crafting6
-			{
-				text = $STR_EPOCH_PLAYER_277;
-				Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-				neednearby[] = {"workshop"};
-				requiretools[] = {"ItemToolbox"};
-				output[] = {{"ItemGunRackKit",1}};
-				input[] = {{"PartWoodLumber",6}};
+		{
+			text = $STR_EPOCH_PLAYER_259;
+			Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"sawmill"};
+			requiretools[] = {"ItemToolbox"};
+			output[] = {{"PartPlankPack",1}};
+			input[] = {{"PartWoodLumber",3}};
+		};
+		class Crafting6
+		{
+			text = $STR_EPOCH_PLAYER_277;
+			Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"workshop"};
+			requiretools[] = {"ItemToolbox"};
+			output[] = {{"ItemGunRackKit",1}};
+			input[] = {{"PartWoodLumber",6}};
 		};
 		class Crafting7
 		{
 			text = $STR_EPOCH_PLAYER_304;
-			Script = ";['Crafting7','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			Script = ";['Crafting7','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodCrateKit",1}};
@@ -1032,25 +1046,25 @@ class PartWoodPlywood: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Plywood";
+	displayName = $STR_EPOCH_PLYWOOD;
 	model = "\z\addons\dayz_epoch\models\plywood.p3d";
-	picture="\z\addons\dayz_epoch\pictures\equip_plywood_CA.paa";
-	descriptionShort = "Plywood: Used for building many structures.";
-	class ItemActions {
+	picture= "\z\addons\dayz_epoch\pictures\equip_plywood_CA.paa";
+	descriptionShort = $STR_EPOCH_PLYWOOD_DESC;
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_260;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"workbench_kit",1}};
 			input[] = {{"PartWoodPlywood",1},{"PartWoodLumber",2}};
-
 		};
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_261;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"wood_shack_kit",1}};
@@ -1059,7 +1073,7 @@ class PartWoodPlywood: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_262;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemWoodFloorQuarter",1}};
@@ -1068,39 +1082,39 @@ class PartWoodPlywood: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_263;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemWoodWallThird",1}};
 			input[] = {{"PartWoodPlywood",3},{"PartWoodLumber",3}};
 		};
 		class Crafting4
-			{
-				text = $STR_EPOCH_PLAYER_264;
-				Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-				neednearby[] = {"sawmill"};
-				requiretools[] = {"ItemToolbox"};
-				output[] = {{"PartPlywoodPack",1}};
-				input[] = {{"PartWoodPlywood",3}};
-			};
-
+		{
+			text = $STR_EPOCH_PLAYER_264;
+			Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"sawmill"};
+			requiretools[] = {"ItemToolbox"};
+			output[] = {{"PartPlywoodPack",1}};
+			input[] = {{"PartWoodPlywood",3}};
+		};
 	};
 };
-
-class ItemSledgeHead : CA_Magazine {
+class ItemSledgeHead : CA_Magazine
+{
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Sledgehammer Head";
+	displayName = $STR_EPOCH_SLEDGEHAMMERHEAD;
 	model = "\z\addons\dayz_epoch\models\sledge_head.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_sledge_head_ca.paa";
-	descriptionShort = "Combine with a handle to make a Sledgehammer";
+	descriptionShort = $STR_EPOCH_SLEDGEHAMMERHEAD_DESC;
 	weight = 9;
-	class ItemActions {
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_275;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {};
@@ -1109,20 +1123,22 @@ class ItemSledgeHead : CA_Magazine {
 		};
 	};
 };
-class ItemSledgeHandle : CA_Magazine {
+class ItemSledgeHandle : CA_Magazine
+{
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Sledgehammer Handle";
+	displayName = $STR_EPOCH_SLEDGEHAMMERHANDLE;
 	model = "\z\addons\dayz_epoch\models\sledge_handle.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_sledge_handle_ca.paa";
-	descriptionShort = "Combine with a head to make a Sledgehammer";
+	descriptionShort = $STR_EPOCH_SLEDGEHAMMERHANDLE_DESC;
 	weight = 1;
-	class ItemActions {
+	class ItemActions
+	{
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_275;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {};
@@ -1131,12 +1147,12 @@ class ItemSledgeHandle : CA_Magazine {
 		};
 	};
 };
-
-class ItemKiloHemp : CA_Magazine {
+class ItemKiloHemp : CA_Magazine
+{
 	scope = public;
 	count = 1;
-	displayName = "Kilo of Hemp";
-	descriptionShort = "Kilo of Hemp";
+	displayName = $STR_EPOCH_KILOOFHEMP;
+	descriptionShort = $STR_EPOCH_KILOOFHEMP;
 	weight = 1;
 	model = "z\addons\dayz_epoch\models\kilohemp.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa";
@@ -1146,7 +1162,7 @@ class ItemKiloHemp : CA_Magazine {
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_269b;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemCanvas",1}};
@@ -1154,12 +1170,12 @@ class ItemKiloHemp : CA_Magazine {
 		};
 		class Crafting1
 		{
-			text = "Craft Hemp Seeds";
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			text = $STR_EPOCH_PLAYER_269a;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
 			output[] = {{"ItemHempSeed",5}};
 			input[] = {{"ItemKiloHemp",1}};
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp
@@ -2,8 +2,8 @@ class metal_floor_kit: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Metal Floor";
-	descriptionShort = "Metal Floor";
+	displayName = $STR_EPOCH_METALFLOOR;
+	descriptionShort = $STR_EPOCH_METALFLOOR;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 325;
@@ -17,12 +17,12 @@ class metal_floor_kit: CA_Magazine {
 	};
 };

-class cinder_wall_kit: CA_Magazine {
+class half_cinder_wall_kit: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Cinder Block Wall";
-	descriptionShort = "Half height cinder block wall";
+	displayName = $STR_EPOCH_CINDERBLOCKWALL_HALF;
+	descriptionShort = $STR_EPOCH_CINDERBLOCKWALL_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 325;
@@ -35,12 +35,30 @@ class cinder_wall_kit: CA_Magazine {
 		};
 	};
 };
+class full_cinder_wall_kit: CA_Magazine {
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_CINDERBLOCKWALL;
+	descriptionShort = $STR_EPOCH_FULLCINDERBLOCKWALL_DESC;
+	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	weight = 600;
+	class ItemActions {
+		class Build {
+			text = $STR_ACTIONS_BUILD;
+			script = "spawn player_build;";
+			require[] = {"ItemToolbox"};
+			create = "CinderWall_DZ";
+		};
+	};
+};
 class cinder_door_kit: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Block Doorway";
-	descriptionShort = "Cinder block doorway";
+	displayName = $STR_EPOCH_BLOCKDOORWAY;
+	descriptionShort = $STR_EPOCH_BLOCKDOORWAY_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 325;
@@ -57,8 +75,8 @@ class cinder_garage_kit: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Block Garage Doorway";
-	descriptionShort = "Cinder block garage doorway";
+	displayName = $STR_EPOCH_BLOCKGARAGEDOORWAY;
+	descriptionShort = $STR_EPOCH_BLOCKGARAGEDOORWAY_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 325;
@@ -76,10 +94,10 @@ class ItemWoodFloor: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Floor/Ceiling";
+	displayName = $STR_EPOCH_FLOORCEILING;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wood Floor can also be used as a ceiling.";
+	descriptionShort = $STR_EPOCH_FLOORCEILING_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -94,10 +112,10 @@ class ItemWoodFloorHalf: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Floor/Ceiling 1/2";
+	displayName = $STR_EPOCH_FLOORCEILINGHALF;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wood Floor can also be used as a ceiling.";
+	descriptionShort = $STR_EPOCH_FLOORCEILING_DESC;
 	weight = 15;
 	class ItemActions {
 		class Build {
@@ -113,7 +131,6 @@ class ItemWoodFloorHalf: CA_Magazine {
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodFloor",1}};
 			input[] = {{"ItemWoodFloorHalf",2}};
-
 		};
 	};
 };
@@ -121,10 +138,10 @@ class ItemWoodFloorQuarter: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Floor/Ceiling 1/4";
+	displayName = $STR_EPOCH_FLOORCEILINGQUARTER;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wood Floor can also be used as a ceiling.";
+	descriptionShort = $STR_EPOCH_FLOORCEILING_DESC;
 	weight = 10;
 	class ItemActions {
 		class Build {
@@ -140,7 +157,6 @@ class ItemWoodFloorQuarter: CA_Magazine {
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodFloorHalf",1}};
 			input[] = {{"ItemWoodFloorQuarter",2}};
-
 		};
 	};
 };
@@ -149,10 +165,10 @@ class ItemWoodStairs: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Stairs";
+	displayName = $STR_EPOCH_WOODSTAIRS;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wood stairs";
+	descriptionShort = $STR_EPOCH_WOODSTAIRS;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -168,7 +184,6 @@ class ItemWoodStairs: CA_Magazine {
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodStairsSupport",1}};
 			input[] = {{"ItemWoodStairs",1},{"PartWoodLumber",2}};
-
 		};
 	};
 };
@@ -176,10 +191,10 @@ class ItemWoodStairsSupport: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Stairs w/ supports";
+	displayName = $STR_EPOCH_WOODSTAIRSWITHSUPPORTS;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wood stairs with supports";
+	descriptionShort = $STR_EPOCH_WOODSTAIRSWITHSUPPORTS_DESC;
 	weight = 30;
 	class ItemActions {
 		class Build {
@@ -195,10 +210,10 @@ class ItemWoodLadder: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Ladder";
+	displayName = $STR_EPOCH_WOODLADDER;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wood Ladder";
+	descriptionShort = $STR_EPOCH_WOODLADDER;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -214,10 +229,10 @@ class ItemWoodWall: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Wall";
+	displayName = $STR_EPOCH_WOODWALL;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WOODWALL_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -256,10 +271,10 @@ class ItemWoodWallThird: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Wall 1/3";
+	displayName = $STR_EPOCH_WOODWALLTHIRDPART;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Third wall constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WOODWALLTHIRDPART_DESC;
 	weight = 7;
 	class ItemActions {
 		class Build {
@@ -282,10 +297,10 @@ class ItemWoodWallWindow: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wall w/ Window";
+	displayName = $STR_EPOCH_WALLWITHWINDOW;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall with Window constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WALLWITHWINDOW_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -301,10 +316,10 @@ class ItemWoodWallDoor: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wall w/ Doorway";
+	displayName = $STR_EPOCH_WALLWITHDOORWAY;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall with doorway constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WALLWITHDOORWAY_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -327,10 +342,10 @@ class ItemWoodWallWithDoor: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wall w/ Door";
+	displayName = $STR_EPOCH_WALLWITHDOOR;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall with door constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WALLWITHDOOR_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -353,10 +368,10 @@ class ItemWoodWallWithDoorLocked: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wall w/ Door Locked";
+	displayName = $STR_EPOCH_WALLWITHDOORLOCKED;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall with door constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WALLWITHDOORLOCKED_DESC;
 	weight = 30;
 	class ItemActions {
 		class Build {
@@ -372,10 +387,10 @@ class ItemWoodWallGarageDoor: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Garage Door";
+	displayName = $STR_EPOCH_WOODGARAGEDOOR;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Garage door constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_WOODGARAGEDOOR_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -398,10 +413,10 @@ class ItemWoodWallGarageDoorLocked: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Wood Garage Door Locked";
+	displayName = $STR_EPOCH_WOODGARAGEDOORLOCKED;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Garage door with combination lock.";
+	descriptionShort = $STR_EPOCH_WOODGARAGEDOORLOCKED_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -417,10 +432,10 @@ class ItemWoodWallLg: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Wood Wall";
+	displayName = $STR_EPOCH_LARGEWOODWALL;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Large wall constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_LARGEWOODWALL_DESC;
 	weight = 25;
 	class ItemActions {
 		class Build {
@@ -459,10 +474,10 @@ class ItemWoodWallWindowLg: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Wall w/ Window";
+	displayName = $STR_EPOCH_LARGEWALLWITHWINDOW;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Large wall with doorway constucted out of plywood and lumber..";
+	descriptionShort = $STR_EPOCH_LARGEWALLWITHWINDOW_DESC;
 	weight = 30;
 	class ItemActions {
 		class Build {
@@ -478,10 +493,10 @@ class ItemWoodWallDoorLg: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Wall w/ Doorway";
+	displayName = $STR_EPOCH_LARGEWALLWITHDOORWAY;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Large wall with doorway constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_LARGEWALLWITHDOORWAY_DESC;
 	weight = 30;
 	class ItemActions {
 		class Build {
@@ -504,10 +519,10 @@ class ItemWoodWallWithDoorLg: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Wall w/ Door";
+	displayName = $STR_EPOCH_LARGEWALLWITHDOOR;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall with door constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_LARGEWALLWITHDOOR_DESC;
 	weight = 30;
 	class ItemActions {
 		class Build {
@@ -530,10 +545,10 @@ class ItemWoodWallWithDoorLgLocked: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Large Wall w/ Door Locked";
+	displayName = $STR_EPOCH_LARGEWALLWITHDOORLOCKED;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	descriptionShort = "Wall with combination lock door constucted out of plywood and lumber.";
+	descriptionShort = $STR_EPOCH_LARGEWALLWITHDOORLOCKED_DESC;
 	weight = 35;
 	class ItemActions {
 		class Build {
@@ -543,4 +558,4 @@ class ItemWoodWallWithDoorLgLocked: CA_Magazine {
 			create = "Land_DZE_LargeWoodDoorLocked";
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Ores.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Ores.hpp
@@ -2,10 +2,10 @@ class PartOre: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Iron Ore";
+	displayName = $STR_ORE_NAME_IRON;
 	model = "\z\addons\dayz_epoch\models\iron_ore.p3d";
 	picture="\z\addons\dayz_epoch\pictures\equip_iron_ore_CA.paa";
-	descriptionShort = "Used for crafting scrap metal. Can be mined from rocks using a sledgehammer.";
+	descriptionShort = $STR_ORE_NAME_IRON_DESC;
 	weight = 1;
 	class ItemActions {
 		class Crafting {
@@ -22,10 +22,10 @@ class PartOreSilver: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Silver Ore";
+	displayName = $STR_ORE_NAME_SILVER;
 	model = "\z\addons\dayz_epoch\models\silver_ore.p3d";
 	picture="\z\addons\dayz_epoch\pictures\equip_silver_ore_CA.paa";
-	descriptionShort = "Can be mined from rocks using a sledgehammer.";
+	descriptionShort = $STR_ORE_DESC;
 	weight = 1;
 	class ItemActions {
 		class Crafting {
@@ -42,10 +42,10 @@ class PartOreGold: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Gold Ore";
+	displayName = $STR_ORE_NAME_GOLD;
 	model = "\z\addons\dayz_epoch\models\gold_ore.p3d";
 	picture="\z\addons\dayz_epoch\pictures\equip_gold_ore_CA.paa";
-	descriptionShort = "Can be mined from rocks using a sledgehammer.";
+	descriptionShort = $STR_ORE_DESC;
 	weight = 1;
 	class ItemActions {
 		class Crafting {
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp
@@ -14,7 +14,7 @@ class TrapBear : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"TrapBear"};
 			create = "BearTrap_DZ";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp
@@ -1,8 +1,8 @@
-class ItemCamoNet : CA_Magazine
+/*class ItemCamoNet : CA_Magazine //Duplicate of Epoch forest_net_kit
 {
 	scope = public;
 	count = 1;
-	type = WeaponSlotItem * 3;
+	type = WeaponSlotItem;
 	
 	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
@@ -14,13 +14,13 @@ class ItemCamoNet : CA_Magazine
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNet"};
 			create = "CamoNet_DZ";
 		};
 	};
-};
+};*/

 /*class ItemCamoNetGrey : ItemCamoNet
 {
@@ -34,7 +34,7 @@ class ItemCamoNet : CA_Magazine
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "; ['ItemCamoNetGrey','Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "; ['ItemCamoNetGrey','Build'] spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNetGrey"};
 			create = "CamoNet_DZ";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp
@@ -0,0 +1,15 @@
+class Mine: TimeBomb
+{
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
+
+class MineE: TimeBomb
+{
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
+
+class PipeBomb: TimeBomb
+{
+	displayName = $STR_DZ_MAG_SATCHEL_NAME; // Singular "Satchel Charge" for death messages "with a x"
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Fuel.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Fuel.hpp
@@ -2,7 +2,7 @@ class ItemJerrycanEmpty : CA_Magazine
 {
 	scope = public;
 	count = 1;
-	type = WeaponSlotItem * 2;
+	type = WeaponSlotItem;
 	
 	model = "\dayz_equip\models\jerrycan.p3d";
 	picture = "\dayz_equip\textures\equip_jerrycan_e_ca.paa";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp
@@ -2,19 +2,20 @@ class ItemGenerator : CA_Magazine
 {
 	scope = public;
 	count = 1;
-	type = WeaponSlotItem * 6;
+	type = WeaponSlotItem;
 	
 	model = "\dayz_equip\models\generator_gear.p3d";
 	picture = "\dayz_equip\textures\equip_generator_ca.paa";
 	displayName = $STR_EQUIP_NAME_31;
 	descriptionShort = $STR_EQUIP_DESC_31;
+	weight = 30; // used in R3F weight
 	
 	class ItemActions
 	{
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemGenerator"};
 			create = "Generator_DZ";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp
@@ -8,7 +8,7 @@

 //Simple buildables
 #include "Tent.hpp"
-#include "CamoNet.hpp"
+//#include "CamoNet.hpp" //Duplicate of Epoch camo nets in DZE\Misc.hpp
 #include "TankTrap.hpp"
 #include "WireFence.hpp"
 #include "BearTrap.hpp"
@@ -23,4 +23,5 @@
 #include "equip_brick.hpp"
 #include "equip_lever.hpp"
 #include "WaterBottle.hpp"
-//#include "Canteen.hpp"
+//#include "Canteen.hpp"
+#include "Explosives.hpp"
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp
@@ -1,40 +1,70 @@
-class ItemMetalSheet: CA_Magazine
+class ItemMetalSheet: CA_Magazine //Construection,farm,indestrial,castle
 {
-	scope = public;
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemMetalSheet;//"Corrugated Sheet"
 	picture = "\z\addons\dayz_buildings\equip\item_sheetmetal.paa";
 	model = "z\addons\dayz_buildings\models\sheet_metal.p3d";
 	descriptionShort = $STR_BLD_desc_ItemMetalSheet;//"Metal Sheeting"
-};		
-class ItemConcreteBlock: CA_Magazine
+};
+		
+class ItemConcreteBlock: CA_Magazine //Construection,indestrial
 {
-	scope = public;
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemConcreteBlock;//"Concrete Block"
 	picture = "\z\addons\dayz_buildings\equip\concreteblock.paa";
 	model = "z\addons\dayz_buildings\models\concreteblock.p3d";
 	descriptionShort = $STR_BLD_desc_ItemConcreteBlock;//"Concrete Block"
-};	
-class ItemRSJ: CA_Magazine
+};
+	
+class ItemRSJ: CA_Magazine //Construection,farm,indestrial,castle
 {
-	scope = public;
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemRSJ;//"Steel Beam"
 	picture = "\z\addons\dayz_buildings\equip\item_rsj.paa";
 	model = "z\addons\dayz_buildings\models\rsj.p3d";
 	descriptionShort = $STR_BLD_desc_ItemRSJ;//"Steel RSJ Support Beam"
-};	
-class ItemScrews: CA_Magazine
+};
+
+class ItemScrews: CA_Magazine //Construection,farm,indestrial,castle,residential
 {
-	scope = public;
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "Loose Screws";//"Box of screws for metal"
+	picture = "\z\addons\dayz_buildings\equip\item_screws.paa";
+	model = "z\addons\dayz_buildings\models\screws.p3d";
+	descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
+};
+
+class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
+{
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemScrews;//"Box of screws for metal"
 	picture = "\z\addons\dayz_buildings\equip\item_screws.paa";
 	model = "z\addons\dayz_buildings\models\screws.p3d";
 	descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
-};
+	
+	class ItemActions {
+		class Spilt {
+			text = "Spilt Box";
+			script = "; [_this] call fn_spiltBag;";
+		};
+	};
+	
+};
+
+/*
+ItemScrews //Construection,farm,indestrial,castle,residential
+ItemBagScrews //(LowChance)Construection,(LowChance)indestrial,supermarket
+ItemRSJ //Construection,farm,indestrial,castle
+ItemConcreteBlock //Construection,indestrial
+ItemMetalSheet //Construection,farm,indestrial,castle
+*/
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp
@@ -1,4 +1,4 @@
-class ItemPadlock: CA_Magazine
+class ItemPadlock: CA_Magazine //Vanilla lock, left in config for potential admin use, but all scripts changed to use Epoch ItemComboLock
 {
 	scope = public;
 	count = 1;
@@ -6,5 +6,5 @@ class ItemPadlock: CA_Magazine
 	displayName = $STR_BLD_name_ItemPadlock;//"Padlock"
 	picture = "\z\addons\dayz_buildings\equip\padlock.paa";
 	model = "z\addons\dayz_buildings\models\padlock.p3d";
-	descriptionShort = $STR_BLD_desc_ItemPadlock;//"Padlock - Used for securing Workshop's & Houses."
+	descriptionShort = $STR_BLD_desc_ItemPadlock;//"Padlock - Used for securing Workshop's and Houses."
 };
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
@@ -14,25 +14,29 @@ class ItemSandbag : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "Sandbag1_DZ";
+			//bypass RoadCheck
 			byPass = "byPassRoadCheck";
 		};
-		
+		/*
 		class Build2
 		{
 			text = $STR_CREATE_STASH;
-			script = "; [_id,'Build2'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "; [_id,'Build2'] spawn player_build;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "StashSmall";
-		};
+			//Bypass collision test
+			bypassCollision = "true";
+		}; 
+		*/
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_273;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbagLarge",1}};
@@ -41,7 +45,7 @@ class ItemSandbag : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_274;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"sandbag_nest_kit",1}};
@@ -50,7 +54,7 @@ class ItemSandbag : CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_298;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"BagFenceRound_DZ_kit",1}};
@@ -60,7 +64,7 @@ class ItemSandbag : CA_Magazine
 		class Crafting3
 		{
 			text = "Craft M240 Nest";
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"};
 			output[] = {{"m240_nest_kit",1}};
@@ -71,20 +75,16 @@ class ItemSandbag : CA_Magazine
 	};
 };

-
-
-
 // EPOCH ADDITIONS

 class BagFenceRound_DZ_kit : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Round Sandbag Fence";
+	displayName = $STR_EQUIP_NAME_21_ROUND;
+	descriptionShort = $STR_EQUIP_DESC_21;
 	model = "\dayz_equip\models\sandbags.p3d";
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = $STR_EQUIP_DESC_21;
-
 	class ItemActions {
 		class Build {
 			text = $STR_EPOCH_PLAYER_299;
@@ -95,7 +95,7 @@ class BagFenceRound_DZ_kit : CA_Magazine {
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_195;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbag",1}};
@@ -109,8 +109,8 @@ class sandbag_nest_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Sandbag Nest";
-	descriptionShort = "Sandbag Nest: A buildable fortification object, can be removed.";
+	displayName = $STR_EQUIP_NAME_21_NEST;
+	descriptionShort = $STR_EQUIP_DESC_21_NEST;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 50;
@@ -130,22 +130,22 @@ class ItemSandbagLarge : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "H-barrier cube";
+	displayName = $STR_EQUIP_NAME_21_HBARRIER;
+	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
 	weight = 50;
 	class ItemActions {
 		class Build {
-			text = "Build H-barrier cube";
+			text = $STR_EPOCH_PLAYER_273_3;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Land_HBarrier1_DZ";
 		};
 		class Crafting
 		{
-			text = "Craft Triple H-barrier";
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			text = $STR_EPOCH_PLAYER_273_1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbagExLarge",1}};
@@ -158,22 +158,22 @@ class ItemSandbagExLarge : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "3 x H-barrier cube";
+	displayName = $STR_EQUIP_NAME_21_3XHBARRIER;
+	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
 	weight = 150;
 	class ItemActions {
 		class Build {
-			text = "Build Triple H-barrier";
+			text = $STR_EPOCH_PLAYER_273_4;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Land_HBarrier3_DZ";
 		};
 		class Crafting
 		{
-			text = "Craft 5x H-barrier";
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			text = $STR_EPOCH_PLAYER_273_2;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbagExLarge5x",1}};
@@ -186,14 +186,14 @@ class ItemSandbagExLarge5x : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "5 x H-barrier cube";
+	displayName = $STR_EQUIP_NAME_21_5XHBARRIER;
+	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
 	weight = 200;
 	class ItemActions {
 		class Build {
-			text = "Build 5x H-barrier";
+			text = $STR_EPOCH_PLAYER_273_5;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Land_HBarrier5_DZ";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp
@@ -14,7 +14,7 @@ class ItemTankTrap : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemTankTrap"};
 			create = "Hedgehog_DZ";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
@@ -2,27 +2,28 @@ class ItemTent : CA_Magazine
 {
 	scope = public;
 	count = 1;
-	type = WeaponSlotItem * 3;
+	type = WeaponSlotItem;
 	
 	model = "\dayz_equip\models\tentbag_gear.p3d";
 	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
 	displayName = $STR_EQUIP_NAME_20;
 	descriptionShort = $STR_EQUIP_DESC_20;
-
 	class ItemActions
 	{
 		class Build
 		{
 			text = $STR_PITCH_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
+			//Bypass collision test
+			bypassCollision = "true";
 		};
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_net_kit",1}};
@@ -31,7 +32,7 @@ class ItemTent : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_net_kit",1}};
@@ -44,7 +45,7 @@ class ItemDomeTent : CA_Magazine
 {
 	scope = public;
 	count = 1;
-	type = WeaponSlotItem * 3;
+	type = WeaponSlotItem;
 	
 	model = "\dayz_equip\models\tentbag_gear.p3d";
 	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
@@ -56,15 +57,17 @@ class ItemDomeTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_DOME_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
+			//Bypass collision test
+			bypassCollision = "true";
 		};
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_net_kit",1}};
@@ -73,16 +76,13 @@ class ItemDomeTent : CA_Magazine
 	};
 };

-
-
 // EPOCH ADDITION

 class ItemDesertTent : CA_Magazine
 {
 	scope = public;
 	count = 1;
-	type = WeaponSlotItem * 3;
-	
+	type = WeaponSlotItem;	
 	model = "\dayz_equip\models\tentbag_gear.p3d";
 	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
 	displayName = $STR_VEH_NAME_DESERT_TENT;
@@ -93,7 +93,7 @@ class ItemDesertTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_DESERT_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemDesertTent"};
 			create = "DesertTentStorage";
@@ -101,7 +101,7 @@ class ItemDesertTent : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_net_kit",1}};
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp
@@ -14,7 +14,7 @@ class ItemTrapTripwireCans : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemTrapTripwireCans"};
 			create = "Trap_Cans";
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp
@@ -4,8 +4,8 @@ class ItemWaterBottleUnfilled : CA_Magazine
 	count = 1;
 	type = WeaponSlotItem;
 	
-	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
-	picture = "\z\addons\dayz_communityassets\textures\waterbottle.paa";
+	model = "\dayz_equip\models\waterbottle_gear.p3d";
+	picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
 	displayName = $STR_EQUIP_NAME_13;
 	descriptionShort = $STR_EQUIP_DESC_13;
 	
@@ -23,14 +23,14 @@ class ItemWaterBottleUnfilled : CA_Magazine
 	};
 };

-class ItemWaterBottleDmg : CA_Magazine
+class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/model , so the regular bottle image is used for now
 {
 	scope = public;
 	count = 1;
 	type = WeaponSlotItem;
 	
-	model = "z\addons\dayz_communityassets\models\waterbottle_damaged.p3d";
-	picture = "\z\addons\dayz_communityassets\textures\waterbottle_damaged.paa";
+	model = "\dayz_equip\models\waterbottle_gear.p3d";
+	picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
 	displayName = $STR_ITEMWATERBOTTLEDMG_CODE_NAME;
 	descriptionShort = $STR_ITEMWATERBOTTLEDMG_CODE_DESC;
 	
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp
@@ -14,7 +14,7 @@ class ItemWire : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemWire"};
 			create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
@@ -58,15 +58,14 @@ class PartWoodPile : CA_Magazine
 	descriptionShort = $STR_EQUIP_DESC_40;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_LIGHTFIRE;
-			script = "spawn player_build;";
-			require[] = {"ItemMatchbox"};
-			create = "Land_Fire_DZ";
+			text = $STR_ACTIONS_MAKEFIRE;
+			script = "spawn player_makeFire;";
+			use[] = {"PartWoodPile"};
 		};
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_242;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"PartWoodLumber",1}};
@@ -75,7 +74,7 @@ class PartWoodPile : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_243;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemKnife"};
 			output[] = {{"WoodenArrow",3}};
@@ -85,7 +84,7 @@ class PartWoodPile : CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_244;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"stick_fence_kit",1}};
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp
@@ -12,7 +12,7 @@ class ItemWorkBench : CA_Magazine
 	class ItemActions {
 		class Build {
 			text = $STR_BLD_build_ItemWorkBench;//"place WorkBench"
-			script = "; ['ItemWorkBench','Build'] spawn player_build; r_action_count = r_action_count + 1;";
+			script = "; ['ItemWorkBench','Build'] spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemWorkBench"};
 			create = "WorkBench";
--- a/Show More
+++ b/Show More