more fixes

+ [ADDED] Raw tuna now does not have infection chance when eaten.
+ [ADDED] Empty 55 gallon barrel icon added
+ [FIXED] 1oz Silver Bar icon was incorrect, now have correct one.

dayz_code/actions/fill_startGenerator.sqf

@@ -67,7 +67,6 @@ if (_finished) then {
 
 			_vehicle setVariable ["GeneratorSound", _soundSource,true];
 
-			// TODO: Add running sounds to generator
 			cutText ["Generator has been started.", "PLAIN DOWN"];
 		};
 	} else {

dayz_code/actions/player_copyKey.sqf

@@ -22,7 +22,7 @@ if(_isNear == 0) exitWith {TradeInprogress = false; cutText ["Key crafting needs
 call gear_ui_init;
 
 // require one tin bar per key
-_hasTinBar = 	"ItemTinBar" in _magazinesPlayer;
+_hasTinBar = 	"ItemTinBar" in magazines player;
 if(!_hasTinBar) exitWith {TradeInprogress = false; cutText ["Key crafting requires a 1oz Tin Bar." , "PLAIN DOWN"]};
 
 player playActionNow "Medic";
@@ -53,9 +53,11 @@ while {r_doLoop} do {
 };
 r_doLoop = false;
 
+if(_finished) then {
+
 	_num_removed = ([player,"ItemTinBar"] call BIS_fnc_invRemove);
 
-if(_finished and _num_removed == 1) then {
+	if(_num_removed == 1) then {
 		// output key to backpack if space
 		_create = _item;
 		_qty = 1;
@@ -65,4 +67,10 @@ if(_finished and _num_removed == 1) then {
 	} else {
 		cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
 	};
+} else {
+	r_interrupt = false;
+	[objNull, player, rSwitchMove,""] call RE;
+	player playActionNow "stop";
+	cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
+};
 TradeInprogress = false;

dayz_code/actions/player_eat.sqf

@@ -13,6 +13,7 @@ _itemorignal = _this;
 _hasfooditem = _itemorignal in magazines player;
 
 _rawfood = _itemorignal in meatraw;
+_rawexceptions = _itemorignal in exceptionsraw;
 _cookedfood = _itemorignal in meatcooked;
 _hasoutput = _itemorignal in food_with_output;
 
@@ -53,7 +54,7 @@ if (_hasoutput) then{
     _item addMagazineCargoGlobal [_itemtodrop,1];
 };
 
-if ( _rawfood and (random 15 < 1)) then {
+if (_rawfood and !_rawexceptions and (random 15 < 1)) then {
 	r_player_infected = true;
 	player setVariable["USEC_infected",true,true];
 };

dayz_code/actions/stopGenerator.sqf

@@ -56,7 +56,6 @@ if (_finished) then {
 		// Stop generator
 		_vehicle setVariable ["GeneratorRunning", false,true];
 
-		// TODO: Add running sounds to generator
 		cutText ["Generator has been stopped.", "PLAIN DOWN"];
 	
 };

dayz_code/init/variables.sqf

@@ -30,6 +30,7 @@ meatraw = [
 	"ItemSeaBass",
 	"ItemTuna"
 ];
+exceptionsraw = ["ItemTuna"];
 meatcooked = [
     "FoodSteakCooked",
     "FoodmeatCooked",

dayz_equip/config.cpp

@@ -1644,9 +1644,8 @@ class CfgMagazines
 		count = 1;
 		type = 256;
 		displayName = "Wooden Shack";
-		// TODO make custom model and icon
-		model = "\dayz_equip\models\woodPile.p3d";
-		picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
+		model = "\dayz_equip\models\supply_crate.p3d";
+		picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa";
 		descriptionShort = "Wooden Shack: A crafted object that holds some items/weapons/backpacks.";
 		class ItemActions {
 			class Build {
@@ -2117,8 +2116,7 @@ class CfgMagazines
 		fuelQuantity = 0;
 		type = 256;
 		displayName = "Fuel Barrel (Empty)";
-		// TODO add X to icon to represent empty barrel
-		picture = "\dayz_equip\textures\equip_oil_drum_model_ca.paa";
+		picture = "\dayz_equip\textures\equip_oildrum_e_CA.paa";
 		descriptionShort = "210 litres of fuel per barrel (Empty)";
 	};
 	class ItemJerrycan: CA_Magazine