From 0c9fbc40c89b4d4f935e75e34c16db7eec3eb52b Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Mon, 21 Nov 2016 13:43:11 -0500
Subject: [PATCH] Remove Salvage from Bicycle in configs

---
 SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp  |  5 +++++
 SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp | 10 ++++++++++
 SQF/dayz_code/actions/userActionConditions.sqf       |  3 +--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp
index 4fa7620c0..2dcc17a89 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp
@@ -3,4 +3,9 @@ class MMT_Civ: MMT_base {
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
+	class UserActions
+	{
+		class Repair {ACTION_REPAIR; radius = 4;};
+		delete Salvage;
+	};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp
index c0e394dee..8ead6df34 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp
@@ -3,6 +3,11 @@ class Old_bike_TK_CIV_EP1: Old_bike_base_EP1 {
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
+	class UserActions
+	{
+		class Repair {ACTION_REPAIR; radius = 4;};
+		delete Salvage;
+	};
 };
 
 class Old_bike_TK_INS_EP1: Old_bike_base_EP1 {
@@ -10,4 +15,9 @@ class Old_bike_TK_INS_EP1: Old_bike_base_EP1 {
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
+	class UserActions
+	{
+		class Repair {ACTION_REPAIR; radius = 4;};
+		delete Salvage;
+	};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/actions/userActionConditions.sqf b/SQF/dayz_code/actions/userActionConditions.sqf
index 976176889..35a921532 100644
--- a/SQF/dayz_code/actions/userActionConditions.sqf
+++ b/SQF/dayz_code/actions/userActionConditions.sqf
@@ -2,7 +2,6 @@
 #define HAS_TOOLBOX ("ItemToolbox" in items player)
 #define IN_VEHICLE (vehicle player != player)
 #define IS_ALIVE (damage _object < 1)
-#define IS_BIKE (_object isKindOf "Bicycle")
 #define IS_PZOMBIE (player isKindOf "PZombie_VB")
 
 private ["_action","_object","_show"];
@@ -14,7 +13,7 @@ _show = switch _action do {
 	case "Butcher": {!IS_ALIVE && !IN_VEHICLE && CAN_DO && !(_object getVariable["meatHarvested",false]) && !IS_PZOMBIE};
 	case "PushPlane": {IS_ALIVE && !IN_VEHICLE && CAN_DO && count crew _object == 0 && !isEngineOn _object && !IS_PZOMBIE};
 	case "Repair": {IS_ALIVE && !IN_VEHICLE && CAN_DO && _object != dayz_myCursorTarget && HAS_TOOLBOX};
-	case "Salvage": {IS_ALIVE && !IN_VEHICLE && CAN_DO && _object != dayz_myCursorTarget && HAS_TOOLBOX && !IS_BIKE && (DZE_salvageLocked or !locked _object)};
+	case "Salvage": {IS_ALIVE && !IN_VEHICLE && CAN_DO && _object != dayz_myCursorTarget && HAS_TOOLBOX && (DZE_salvageLocked or !locked _object)};
 	case "StudyBody": {!IS_ALIVE && !IN_VEHICLE && !(_object isKindOf "zZombie_base")};
 	default {false};
 };