diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index 5ed9252b..9c12940a 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -20,11 +20,11 @@ function loadVehiclesFromDatabase() {
 	let dbConnection = connectToDatabase();
 	let tempVehicles = [];
 	let dbAssoc;
-	if(dbConnection) {
+	if (dbConnection) {
 		let dbQueryString = `SELECT * FROM veh_main WHERE veh_server = ${getServerId()} AND veh_deleted = 0`;
 		let dbQuery = queryDatabase(dbConnection, dbQueryString);
-		if(dbQuery) {
-			while(dbAssoc = fetchQueryAssoc(dbQuery)) {
+		if (dbQuery) {
+			while (dbAssoc = fetchQueryAssoc(dbQuery)) {
 				let tempVehicleData = new VehicleData(dbAssoc);
 				tempVehicles.push(tempVehicleData);
 			}
@@ -40,14 +40,14 @@ function loadVehiclesFromDatabase() {
 // ===========================================================================
 
 function saveAllVehiclesToDatabase() {
-	if(getServerConfig().devServer) {
+	if (getServerConfig().devServer) {
 		return false;
 	}
 
 	logToConsole(LOG_INFO, "[VRR.Vehicle]: Saving all server vehicles to database ...");
 	let vehicles = getServerData().vehicles;
-	for(let i in vehicles) {
-		if(vehicles[i].needsSaved) {
+	for (let i in vehicles) {
+		if (vehicles[i].needsSaved) {
 			saveVehicleToDatabase(i);
 		}
 	}
@@ -59,29 +59,29 @@ function saveAllVehiclesToDatabase() {
 // ===========================================================================
 
 function saveVehicleToDatabase(vehicleDataId) {
-	if(getVehicleData(vehicleDataId) == null) {
+	if (getVehicleData(vehicleDataId) == null) {
 		// Invalid vehicle data
 		return false;
 	}
 
 	let tempVehicleData = getServerData().vehicles[vehicleDataId];
 
-	if(tempVehicleData.databaseId == -1) {
+	if (tempVehicleData.databaseId == -1) {
 		// Temp vehicle, no need to save
 		return false;
 	}
 
-	if(!tempVehicleData.needsSaved) {
+	if (!tempVehicleData.needsSaved) {
 		// Vehicle hasn't changed. No need to save.
 		return false;
 	}
 
 	logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Saving vehicle ${tempVehicleData.databaseId} to database ...`);
 	let dbConnection = connectToDatabase();
-	if(dbConnection) {
-		if(tempVehicleData.vehicle != false) {
-			if(!tempVehicleData.spawnLocked) {
-				if(areServerElementsSupported()) {
+	if (dbConnection) {
+		if (tempVehicleData.vehicle != false) {
+			if (!tempVehicleData.spawnLocked) {
+				if (areServerElementsSupported()) {
 					tempVehicleData.spawnPosition = tempVehicleData.vehicle.position;
 					tempVehicleData.spawnRotation = tempVehicleData.vehicle.heading;
 				} else {
@@ -112,19 +112,19 @@ function saveVehicleToDatabase(vehicleDataId) {
 			["veh_col2_isrgb", boolToInt(tempVehicleData.colour2IsRGBA)],
 			["veh_col3_isrgb", boolToInt(tempVehicleData.colour3IsRGBA)],
 			["veh_col4_isrgb", boolToInt(tempVehicleData.colour4IsRGBA)],
-			["veh_extra1", tempVehicleData.extras[0]],
-			["veh_extra2", tempVehicleData.extras[1]],
-			["veh_extra3", tempVehicleData.extras[2]],
-			["veh_extra4", tempVehicleData.extras[3]],
-			["veh_extra5", tempVehicleData.extras[4]],
-			["veh_extra6", tempVehicleData.extras[5]],
-			["veh_extra7", tempVehicleData.extras[6]],
-			["veh_extra8", tempVehicleData.extras[7]],
-			["veh_extra9", tempVehicleData.extras[8]],
-			["veh_extra10", tempVehicleData.extras[9]],
-			["veh_extra11", tempVehicleData.extras[10]],
-			["veh_extra12", tempVehicleData.extras[11]],
-			["veh_extra13", tempVehicleData.extras[12]],
+			//["veh_extra1", tempVehicleData.extras[0]],
+			//["veh_extra2", tempVehicleData.extras[1]],
+			//["veh_extra3", tempVehicleData.extras[2]],
+			//["veh_extra4", tempVehicleData.extras[3]],
+			//["veh_extra5", tempVehicleData.extras[4]],
+			//["veh_extra6", tempVehicleData.extras[5]],
+			//["veh_extra7", tempVehicleData.extras[6]],
+			//["veh_extra8", tempVehicleData.extras[7]],
+			//["veh_extra9", tempVehicleData.extras[8]],
+			//["veh_extra10", tempVehicleData.extras[9]],
+			//["veh_extra11", tempVehicleData.extras[10]],
+			//["veh_extra12", tempVehicleData.extras[11]],
+			//["veh_extra13", tempVehicleData.extras[12]],
 			["veh_engine", intToBool(tempVehicleData.engine)],
 			["veh_lights", intToBool(tempVehicleData.lights)],
 			["veh_health", toInteger(tempVehicleData.health)],
@@ -137,7 +137,7 @@ function saveVehicleToDatabase(vehicleDataId) {
 		];
 
 		let dbQuery = null;
-		if(tempVehicleData.databaseId == 0) {
+		if (tempVehicleData.databaseId == 0) {
 			let queryString = createDatabaseInsertQuery("veh_main", data);
 			dbQuery = queryDatabase(dbConnection, queryString);
 			getServerData().vehicles[vehicleDataId].databaseId = getDatabaseInsertId(dbConnection);
@@ -160,7 +160,7 @@ function saveVehicleToDatabase(vehicleDataId) {
 // ===========================================================================
 
 function spawnAllVehicles() {
-	for(let i in getServerData().vehicles) {
+	for (let i in getServerData().vehicles) {
 		let vehicle = spawnVehicle(getServerData().vehicles[i]);
 		getServerData().vehicles[i].vehicle = vehicle;
 		setEntityData(vehicle, "vrr.dataSlot", i, false);
@@ -175,10 +175,10 @@ function spawnAllVehicles() {
 	* @return {VehicleData} The vehicles's data (class instance)
 	*/
 function getVehicleData(vehicle) {
-	if(getGame() != VRR_GAME_GTA_IV) {
-		if(isVehicleObject(vehicle)) {
+	if (getGame() != VRR_GAME_GTA_IV) {
+		if (isVehicleObject(vehicle)) {
 			let dataIndex = getEntityData(vehicle, "vrr.dataSlot");
-			if(typeof getServerData().vehicles[dataIndex] != "undefined") {
+			if (typeof getServerData().vehicles[dataIndex] != "undefined") {
 				return getServerData().vehicles[dataIndex];
 			}
 		}
@@ -192,20 +192,20 @@ function getVehicleData(vehicle) {
 // ===========================================================================
 
 function createVehicleCommand(command, params, client) {
-	if(areParamsEmpty(params)) {
+	if (areParamsEmpty(params)) {
 		messagePlayerSyntax(client, getCommandSyntaxText(command));
 		return false;
 	}
 
 	let modelIndex = getVehicleModelIndexFromParams(params);
 
-	if(!modelIndex) {
+	if (!modelIndex) {
 		messagePlayerError(client, "That vehicle type is invalid!");
 		return false;
 	}
 
 	let heading = getPlayerHeading(client);
-	if(getGame() == VRR_GAME_MAFIA_ONE) {
+	if (getGame() == VRR_GAME_MAFIA_ONE) {
 		heading = degToRad(getPlayerHeading(client));
 	}
 
@@ -218,14 +218,14 @@ function createVehicleCommand(command, params, client) {
 // ===========================================================================
 
 function createTemporaryVehicleCommand(command, params, client) {
-	if(areParamsEmpty(params)) {
+	if (areParamsEmpty(params)) {
 		messagePlayerSyntax(client, getCommandSyntaxText(command));
 		return false;
 	}
 
 	let modelIndex = getVehicleModelIndexFromParams(params);
 
-	if(!modelIndex) {
+	if (!modelIndex) {
 		messagePlayerError(client, "That vehicle type is invalid!");
 		return false;
 	}
@@ -241,34 +241,34 @@ function createTemporaryVehicleCommand(command, params, client) {
 function getNearbyVehiclesCommand(command, params, client) {
 	let distance = 10.0;
 
-	if(!areParamsEmpty(params)) {
+	if (!areParamsEmpty(params)) {
 		distance = getParam(params, " ", 1);
 	}
 
-	if(isNaN(distance)) {
+	if (isNaN(distance)) {
 		messagePlayerError(client, "The distance must be a number!");
 		return false;
 	}
 
 	distance = toFloat(distance);
 
-	if(distance <= 0) {
+	if (distance <= 0) {
 		messagePlayerError(client, "The distance must be more than 0!");
 		return false;
 	}
 
 	let nearbyVehicles = getVehiclesInRange(getPlayerPosition(client), distance);
 
-	if(nearbyVehicles.length == 0) {
+	if (nearbyVehicles.length == 0) {
 		messagePlayerAlert(client, getLocaleString(client, "NoVehiclesWithinRange", distance));
 		return false;
 	}
 
-	let vehiclesList = nearbyVehicles.map(function(x) { return `{ALTCOLOUR}${getVehicleData(x).index}: {MAINCOLOUR}${getVehicleName(x)} {darkGrey}(${getDistance(getPlayerPosition(client), getVehiclePosition(x))} ${getLocaleString(client, "Meters")} ${getGroupedLocaleString(client, "CardinalDirections")[getCardinalDirection(getPlayerPosition(client), getVehiclePosition(x))]}})`; });
+	let vehiclesList = nearbyVehicles.map(function (x) { return `{ALTCOLOUR}${getVehicleData(x).index}: {MAINCOLOUR}${getVehicleName(x)} {darkGrey}(${getDistance(getPlayerPosition(client), getVehiclePosition(x))} ${getLocaleString(client, "Meters")} ${getGroupedLocaleString(client, "CardinalDirections")[getCardinalDirection(getPlayerPosition(client), getVehiclePosition(x))]}})`; });
 	let chunkedList = splitArrayIntoChunks(vehiclesList, 4);
 
 	messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderVehiclesInRangeList")));
-	for(let i in chunkedList) {
+	for (let i in chunkedList) {
 		messagePlayerInfo(client, chunkedList[i].join(", "));
 	}
 }
@@ -279,17 +279,17 @@ function vehicleTrunkCommand(command, params, client) {
 	let vehicle = getClosestVehicle(getPlayerPosition(client));
 
 	let behindPosition = getPosBehindPos(getVehiclePosition(vehicle), getVehicleHeading(vehicle), getGlobalConfig().vehicleTrunkDistance);
-	if(!getPlayerVehicle(client) && getDistance(behindPosition, getPlayerPosition(client)) > getGlobalConfig().vehicleTrunkDistance) {
+	if (!getPlayerVehicle(client) && getDistance(behindPosition, getPlayerPosition(client)) > getGlobalConfig().vehicleTrunkDistance) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInOrNearVehicle"));
 		return false;
 	}
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!doesPlayerHaveVehicleKeys(client, vehicle)) {
+	if (!doesPlayerHaveVehicleKeys(client, vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "DontHaveVehicleKey"));
 		return false;
 	}
@@ -304,19 +304,19 @@ function vehicleTrunkCommand(command, params, client) {
 // ===========================================================================
 
 function vehicleLightsCommand(command, params, client) {
-	if(!getPlayerVehicle(client)) {
+	if (!getPlayerVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(getPlayerVehicleSeat(client) > 1) {
+	if (getPlayerVehicleSeat(client) > 1) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInVehicleFrontSeat"));
 		return false;
 	}
@@ -331,14 +331,14 @@ function vehicleLightsCommand(command, params, client) {
 // ===========================================================================
 
 function deleteVehicleCommand(command, params, client) {
-	if(!getPlayerVehicle(client)) {
+	if (!getPlayerVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -357,24 +357,24 @@ function deleteVehicleCommand(command, params, client) {
 // ===========================================================================
 
 function vehicleEngineCommand(command, params, client) {
-	if(!getPlayerVehicle(client)) {
+	if (!getPlayerVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
-	if(getPlayerVehicleSeat(client) > 0) {
+	if (getPlayerVehicleSeat(client) > 0) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInVehicleDriverSeat"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!doesPlayerHaveVehicleKeys(client, vehicle)) {
+	if (!doesPlayerHaveVehicleKeys(client, vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "DontHaveVehicleKey"));
 		return false;
 	}
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -391,24 +391,24 @@ function vehicleEngineCommand(command, params, client) {
 // ===========================================================================
 
 function vehicleSirenCommand(command, params, client) {
-	if(!getPlayerVehicle(client)) {
+	if (!getPlayerVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(getPlayerVehicleSeat(client) > 1) {
+	if (getPlayerVehicleSeat(client) > 1) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInVehicleFrontSeat"));
 		return false;
 	}
 
-	if(!doesPlayerHaveVehicleKeys(client, vehicle)) {
+	if (!doesPlayerHaveVehicleKeys(client, vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "DontHaveVehicleKey"));
 		return false;
 	}
@@ -424,19 +424,19 @@ function vehicleSirenCommand(command, params, client) {
 // ===========================================================================
 
 function vehicleAdminColourCommand(command, params, client) {
-	if(areParamsEmpty(params) && areThereEnoughParams(params, 2)) {
+	if (areParamsEmpty(params) && areThereEnoughParams(params, 2)) {
 		messagePlayerSyntax(client, getCommandSyntaxText(command));
 		return false;
 	}
 
-	if(!getPlayerVehicle(client)) {
+	if (!getPlayerVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -459,7 +459,7 @@ function vehicleAdminColourCommand(command, params, client) {
 // ===========================================================================
 
 function vehicleAdminRepairCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} could not repair their vehicle. Reason: Not in a vehicle.`);
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
@@ -467,7 +467,7 @@ function vehicleAdminRepairCommand(command, params, client) {
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} could not repair their ${getVehicleName(vehicle)} vehicle. Not a server vehicle.`);
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
@@ -483,20 +483,20 @@ function vehicleAdminRepairCommand(command, params, client) {
 // ===========================================================================
 
 function vehicleAdminLiveryCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(getPlayerCurrentSubAccount(client).cash < getGlobalConfig().repairVehicleCost) {
-		messagePlayerError(client, `You don't have enough money to change the vehicle's livery (need $${makeLargeNumberReadable(getGlobalConfig().resprayVehicleCost-getPlayerCurrentSubAccount(client).cash)} more!)`);
+	if (getPlayerCurrentSubAccount(client).cash < getGlobalConfig().repairVehicleCost) {
+		messagePlayerError(client, `You don't have enough money to change the vehicle's livery (need $${makeLargeNumberReadable(getGlobalConfig().resprayVehicleCost - getPlayerCurrentSubAccount(client).cash)} more!)`);
 		return false;
 	}
 
@@ -516,24 +516,24 @@ function vehicleAdminLiveryCommand(command, params, client) {
 // ===========================================================================
 
 function buyVehicleCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(getVehicleData(vehicle).buyPrice <= 0) {
+	if (getVehicleData(vehicle).buyPrice <= 0) {
 		messagePlayerError(client, getLocaleString(client, "VehicleNotForSale"));
 		return false;
 	}
 
-	if(getPlayerCurrentSubAccount(client).cash < getVehicleData(vehicle).buyPrice) {
+	if (getPlayerCurrentSubAccount(client).cash < getVehicleData(vehicle).buyPrice) {
 		messagePlayerError(client, getLocaleString(client, "VehiclePurchaseNotEnoughMoney"));
 		return false;
 	}
@@ -553,31 +553,31 @@ function buyVehicleCommand(command, params, client) {
 // ===========================================================================
 
 function rentVehicleCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, getLocaleString(client, "MustBeInAVehicle"));
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(getVehicleData(vehicle).rentPrice <= 0) {
+	if (getVehicleData(vehicle).rentPrice <= 0) {
 		messagePlayerError(client, getLocaleString(client, "VehicleNotForRent"));
 		return false;
 	}
 
-	if(getPlayerData(client).rentingVehicle) {
+	if (getPlayerData(client).rentingVehicle) {
 		messagePlayerAlert(client, `You are no longer renting the ${getVehicleName(vehicle)}`);
 		stopRentingVehicle(client);
 		return false;
 	}
 
-	if(getVehicleData(vehicle).rentedBy != false) {
-		if(getVehicleData(vehicle).rentedBy != client) {
+	if (getVehicleData(vehicle).rentedBy != false) {
+		if (getVehicleData(vehicle).rentedBy != client) {
 			messagePlayerAlert(client, `Someone else is already renting this vehicle!`);
 			return false;
 		} else {
@@ -586,8 +586,8 @@ function rentVehicleCommand(command, params, client) {
 		}
 	}
 
-	if(getVehicleData(vehicle).rentPrice > getPlayerCurrentSubAccount(client).cash) {
-		messagePlayerError(client, getLocaleString(client, "NotEnoughCashNeedAmountMore", getVehicleData(vehicle).rentPrice-getPlayerCurrentSubAccount(client).cash));
+	if (getVehicleData(vehicle).rentPrice > getPlayerCurrentSubAccount(client).cash) {
+		messagePlayerError(client, getLocaleString(client, "NotEnoughCashNeedAmountMore", getVehicleData(vehicle).rentPrice - getPlayerCurrentSubAccount(client).cash));
 		return false;
 	}
 
@@ -600,8 +600,8 @@ function rentVehicleCommand(command, params, client) {
 	meActionToNearbyPlayers(client, `rents the ${getVehicleName(vehicle)} and receives a set of vehicle keys!`);
 	messagePlayerAlert(client, `You will be charged $${makeLargeNumberReadable(getVehicleData(vehicle).rentPrice)} per minute to use this vehicle. To stop renting this vehicle, use /vehrent again.`);
 
-	if(!getVehicleData(vehicle).engine) {
-		if(!doesPlayerHaveKeyBindsDisabled(client) && doesPlayerHaveKeyBindForCommand(client, "engine")) {
+	if (!getVehicleData(vehicle).engine) {
+		if (!doesPlayerHaveKeyBindsDisabled(client) && doesPlayerHaveKeyBindForCommand(client, "engine")) {
 			messagePlayerTip(client, `The ${getVehicleName(vehicle)}'s engine is off. Press {ALTCOLOUR}${toUpperCase(getKeyNameFromId(getPlayerKeyBindForCommand(client, "engine").key))} {MAINCOLOUR}to start it.`);
 		} else {
 			messagePlayerAlert(client, `The ${getVehicleName(vehicle)}'s engine is off. Use /engine to start it`);
@@ -618,7 +618,7 @@ function enterVehicleAsPassengerCommand(command, params, client) {
 // ===========================================================================
 
 function stopRentingVehicleCommand(command, params, client) {
-	if(!getPlayerData(client).rentingVehicle) {
+	if (!getPlayerData(client).rentingVehicle) {
 		messagePlayerError(client, "You aren't renting a vehicle!");
 		return false;
 	}
@@ -635,43 +635,43 @@ function stopRentingVehicleCommand(command, params, client) {
 function doesPlayerHaveVehicleKeys(client, vehicle) {
 	let vehicleData = getVehicleData(vehicle);
 
-	if(doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
+	if (doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
 		return true;
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_PUBLIC) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_PUBLIC) {
 		return true;
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_PLAYER) {
-		if(vehicleData.ownerId == getPlayerCurrentSubAccount(client).databaseId) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_PLAYER) {
+		if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).databaseId) {
 			return true;
 		}
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_CLAN) {
-		if(vehicleData.ownerId == getPlayerCurrentSubAccount(client).clan) {
-			if(vehicleData.clanRank <= getPlayerCurrentSubAccount(client).clanRank) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_CLAN) {
+		if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).clan) {
+			if (vehicleData.clanRank <= getPlayerCurrentSubAccount(client).clanRank) {
 				return true;
 			}
 		}
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_FACTION) {
-		if(vehicleData.ownerId == getPlayerCurrentSubAccount(client).faction) {
-			if(vehicleData.factionRank <= getPlayerCurrentSubAccount(client).factionRank) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_FACTION) {
+		if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).faction) {
+			if (vehicleData.factionRank <= getPlayerCurrentSubAccount(client).factionRank) {
 				return true;
 			}
 		}
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_JOB) {
-		if(vehicleData.ownerId == getPlayerCurrentSubAccount(client).job) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_JOB) {
+		if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).job) {
 			return true;
 		}
 	}
 
-	if(vehicleData.rentedBy == client) {
+	if (vehicleData.rentedBy == client) {
 		return true;
 	}
 
@@ -683,19 +683,19 @@ function doesPlayerHaveVehicleKeys(client, vehicle) {
 function doesClientOwnVehicle(client, vehicle) {
 	let vehicleData = getVehicleData(vehicle);
 
-	if(doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
+	if (doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
 		return true;
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_PLAYER) {
-		if(vehicleData.ownerId == getPlayerData(client).accountData.databaseId) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_PLAYER) {
+		if (vehicleData.ownerId == getPlayerData(client).accountData.databaseId) {
 			return true;
 		}
 	}
 
-	if(vehicleData.ownerType == VRR_VEHOWNER_CLAN) {
-		if(vehicleData.ownerId == getPlayerCurrentSubAccount(client).clan) {
-			if(doesPlayerHaveClanPermission(client, "ManageVehicles") || doesPlayerHaveClanPermission(client, "owner")) {
+	if (vehicleData.ownerType == VRR_VEHOWNER_CLAN) {
+		if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).clan) {
+			if (doesPlayerHaveClanPermission(client, "ManageVehicles") || doesPlayerHaveClanPermission(client, "owner")) {
 				return true;
 			}
 		}
@@ -707,14 +707,14 @@ function doesClientOwnVehicle(client, vehicle) {
 // ===========================================================================
 
 function setVehicleJobCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -722,7 +722,7 @@ function setVehicleJobCommand(command, params, client) {
 	let closestJobLocation = getClosestJobLocation(getVehiclePosition(vehicle));
 	let jobId = closestJobLocation.job;
 
-	if(!areParamsEmpty(params)) {
+	if (!areParamsEmpty(params)) {
 		jobId = getJobFromParams(params);
 	}
 
@@ -743,12 +743,12 @@ function setVehicleJobCommand(command, params, client) {
 // ===========================================================================
 
 function setVehicleRankCommand(command, params, client) {
-	if(areParamsEmpty(params)) {
+	if (areParamsEmpty(params)) {
 		messagePlayerSyntax(client, getCommandSyntaxText(command));
 		return false;
 	}
 
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
@@ -756,20 +756,20 @@ function setVehicleRankCommand(command, params, client) {
 	let vehicle = getPlayerVehicle(client);
 	let rankId = params;
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(getVehicleData(vehicle).ownerType == VRR_VEHOWNER_CLAN) {
+	if (getVehicleData(vehicle).ownerType == VRR_VEHOWNER_CLAN) {
 		rankId = getClanRankFromParams(getVehicleData(vehicle).ownerId, params);
-		if(!getClanRankData(getVehicleData(vehicle).ownerId, rankId)) {
+		if (!getClanRankData(getVehicleData(vehicle).ownerId, rankId)) {
 			messagePlayerError(client, getLocaleString(client, "ClanRankInvalid"));
 			return false;
 		}
 		getVehicleData(vehicle).rank = getClanRankData(getVehicleData(vehicle).ownerId, rankId).databaseId;
 		messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} set their {vehiclePurple}${getVehicleName(vehicle)}{MAINCOLOUR} rank to {ALTCOLOUR}${getClanRankData(getVehicleData(vehicle).ownerId, rankId).name}{MAINCOLOUR} of the {clanOrange}${getClanData(getVehicleData(vehicle).ownerId).name}{MAINCOLOUR} clan!`);
-	} else if(getVehicleData(vehicle).ownerType == VRR_VEHOWNER_JOB) {
+	} else if (getVehicleData(vehicle).ownerType == VRR_VEHOWNER_JOB) {
 		getVehicleData(vehicle).rank = rankId;
 		messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} set their {vehiclePurple}${getVehicleName(vehicle)}{MAINCOLOUR} rank to {ALTCOLOUR}${rankId}{MAINCOLOUR} of the {jobYellow}${getJobData(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)).name}{MAINCOLOUR} job!`);
 	}
@@ -780,7 +780,7 @@ function setVehicleRankCommand(command, params, client) {
 // ===========================================================================
 
 function setVehicleClanCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
@@ -788,22 +788,22 @@ function setVehicleClanCommand(command, params, client) {
 	let vehicle = getPlayerVehicle(client);
 	let clanId = getPlayerClan(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!getClanData(clanId)) {
+	if (!getClanData(clanId)) {
 		messagePlayerError(client, "That clan is invalid or doesn't exist!");
 		return false;
 	}
 
-	if(getVehicleData(vehicle).ownerType != VRR_VEHOWNER_PLAYER) {
+	if (getVehicleData(vehicle).ownerType != VRR_VEHOWNER_PLAYER) {
 		messagePlayerError(client, getLocaleString(client, "MustOwnVehicle"));
 		return false;
 	}
 
-	if(getVehicleData(vehicle).ownerId != getPlayerCurrentSubAccount(client).databaseId) {
+	if (getVehicleData(vehicle).ownerId != getPlayerCurrentSubAccount(client).databaseId) {
 		messagePlayerError(client, getLocaleString(client, "MustOwnVehicle"));
 		return false;
 	}
@@ -817,7 +817,7 @@ function setVehicleClanCommand(command, params, client) {
 // ===========================================================================
 
 function setVehicleToBusinessCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
@@ -825,12 +825,12 @@ function setVehicleToBusinessCommand(command, params, client) {
 	let vehicle = getPlayerVehicle(client);
 	let businessId = getPlayerBusiness(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!getBusinessData(businessId)) {
+	if (!getBusinessData(businessId)) {
 		messagePlayerError(client, getLocaleString(client, "InvalidBusiness"));
 		return false;
 	}
@@ -846,7 +846,7 @@ function setVehicleToBusinessCommand(command, params, client) {
 // ===========================================================================
 
 function setVehicleOwnerCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
@@ -854,12 +854,12 @@ function setVehicleOwnerCommand(command, params, client) {
 	let vehicle = getPlayerVehicle(client);
 	let targetClient = getPlayerFromParams(params);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!targetClient) {
+	if (!targetClient) {
 		messagePlayerError(client, "That player is invalid or isn't connected!");
 		return false;
 	}
@@ -875,14 +875,14 @@ function setVehicleOwnerCommand(command, params, client) {
 // ===========================================================================
 
 function setVehiclePublicCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -898,20 +898,20 @@ function setVehiclePublicCommand(command, params, client) {
 // ===========================================================================
 
 function setVehicleRentPriceCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!doesClientOwnVehicle(client, vehicle)) {
-		if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
+	if (!doesClientOwnVehicle(client, vehicle)) {
+		if (!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
 			messagePlayerError(client, "You can't set the rent price for this vehicle!");
 		}
 	}
@@ -927,20 +927,20 @@ function setVehicleRentPriceCommand(command, params, client) {
 // ===========================================================================
 
 function setVehicleBuyPriceCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!doesClientOwnVehicle(client, vehicle)) {
-		if(!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
+	if (!doesClientOwnVehicle(client, vehicle)) {
+		if (!doesPlayerHaveStaffPermission(client, getStaffFlagValue("ManageVehicles"))) {
 			messagePlayerError(client, "You can't set the buy price for this vehicle!");
 		}
 	}
@@ -956,7 +956,7 @@ function setVehicleBuyPriceCommand(command, params, client) {
 // ===========================================================================
 
 function removeVehicleOwnerCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
@@ -964,12 +964,12 @@ function removeVehicleOwnerCommand(command, params, client) {
 	let vehicle = getPlayerVehicle(client);
 	let targetClient = getPlayerFromParams(params);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
 
-	if(!targetClient) {
+	if (!targetClient) {
 		messagePlayerError(client, "That player is invalid or isn't connected!");
 		return false;
 	}
@@ -986,14 +986,14 @@ function removeVehicleOwnerCommand(command, params, client) {
 // ===========================================================================
 
 function getVehicleInfoCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
 
 	let vehicle = getPlayerVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -1002,7 +1002,7 @@ function getVehicleInfoCommand(command, params, client) {
 
 	let ownerName = "Nobody";
 	let ownerType = "None";
-	switch(vehicleData.ownerType) {
+	switch (vehicleData.ownerType) {
 		case VRR_VEHOWNER_CLAN:
 			ownerName = getClanData(getClanIdFromDatabaseId(vehicleData.ownerId)).name;
 			ownerType = "clan";
@@ -1053,7 +1053,7 @@ function getVehicleInfoCommand(command, params, client) {
 
 	messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderVehicleInfo")));
 	let chunkedList = splitArrayIntoChunks(stats, 6);
-	for(let i in chunkedList) {
+	for (let i in chunkedList) {
 		messagePlayerInfo(client, chunkedList[i].join(", "));
 	}
 
@@ -1070,7 +1070,7 @@ function getLastVehicleInfoCommand(command, params, client) {
 
 	let vehicle = getPlayerLastVehicle(client);
 
-	if(!getVehicleData(vehicle)) {
+	if (!getVehicleData(vehicle)) {
 		messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
 		return false;
 	}
@@ -1079,7 +1079,7 @@ function getLastVehicleInfoCommand(command, params, client) {
 
 	let ownerName = "Nobody";
 	let ownerType = "None";
-	switch(vehicleData.ownerType) {
+	switch (vehicleData.ownerType) {
 		case VRR_VEHOWNER_CLAN:
 			ownerName = getClanData(vehicleData.ownerId).name;
 			ownerType = "clan";
@@ -1118,7 +1118,7 @@ function getLastVehicleInfoCommand(command, params, client) {
 // ===========================================================================
 
 function toggleVehicleSpawnLockCommand(command, params, client) {
-	if(!isPlayerInAnyVehicle(client)) {
+	if (!isPlayerInAnyVehicle(client)) {
 		messagePlayerError(client, "You need to be in a vehicle!");
 		return false;
 	}
@@ -1126,7 +1126,7 @@ function toggleVehicleSpawnLockCommand(command, params, client) {
 	let vehicle = getPlayerVehicle(client);
 
 	getVehicleData(vehicle).spawnLocked = !getVehicleData(vehicle).spawnLocked;
-	if(getVehicleData(vehicle).spawnLocked) {
+	if (getVehicleData(vehicle).spawnLocked) {
 		getVehicleData(vehicle).spawnPosition = getVehiclePosition(vehicle);
 		getVehicleData(vehicle).spawnRotation = getVehicleHeading(vehicle);
 	}
@@ -1139,8 +1139,8 @@ function toggleVehicleSpawnLockCommand(command, params, client) {
 // ===========================================================================
 
 function reloadAllVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(getServerData().vehicles[i].vehicle) {
+	for (let i in getServerData().vehicles) {
+		if (getServerData().vehicles[i].vehicle) {
 			deleteGameElement(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1157,7 +1157,7 @@ function reloadAllVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnVehicleCommand(command, params, client) {
-	if(isPlayerInAnyVehicle(client)) {
+	if (isPlayerInAnyVehicle(client)) {
 		removeAllOccupantsFromVehicle(getPlayerVehicle(client));
 		respawnVehicle(getPlayerVehicle(client));
 	}
@@ -1171,12 +1171,12 @@ function respawnVehicleCommand(command, params, client) {
 // ===========================================================================
 
 function respawnAllVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
+	for (let i in getServerData().vehicles) {
 		respawnVehicle(getServerData().vehicles[i].vehicle);
 	}
 
 	let randomVehicles = getElementsByType(ELEMENT_VEHICLE).filter(v => getVehicleData(v) == false);
-	for(let i in randomVehicles) {
+	for (let i in randomVehicles) {
 		destroyElement(randomVehicles[i]);
 	}
 
@@ -1188,15 +1188,15 @@ function respawnAllVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnEmptyVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(!isVehicleUnoccupied(getServerData().vehicles[i].vehicle)) {
+	for (let i in getServerData().vehicles) {
+		if (!isVehicleUnoccupied(getServerData().vehicles[i].vehicle)) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
 
 	let clientVehicles = getElementsByType(ELEMENT_VEHICLE).filter(v => getVehicleData(v) == false);
-	for(let i in clientVehicles) {
-		if(!isVehicleUnoccupied(clientVehicles[i])) {
+	for (let i in clientVehicles) {
+		if (!isVehicleUnoccupied(clientVehicles[i])) {
 			destroyElement(clientVehicles[i]);
 		}
 	}
@@ -1207,8 +1207,8 @@ function respawnEmptyVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnJobVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(getServerData().vehicles[i].ownerType == VRR_VEHOWNER_JOB) {
+	for (let i in getServerData().vehicles) {
+		if (getServerData().vehicles[i].ownerType == VRR_VEHOWNER_JOB) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1219,8 +1219,8 @@ function respawnJobVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnClanVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(getServerData().vehicles[i].ownerType == VRR_VEHOWNER_CLAN) {
+	for (let i in getServerData().vehicles) {
+		if (getServerData().vehicles[i].ownerType == VRR_VEHOWNER_CLAN) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1231,8 +1231,8 @@ function respawnClanVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnPlayerVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(getServerData().vehicles[i].ownerType == VRR_VEHOWNER_PLAYER) {
+	for (let i in getServerData().vehicles) {
+		if (getServerData().vehicles[i].ownerType == VRR_VEHOWNER_PLAYER) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1243,8 +1243,8 @@ function respawnPlayerVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnPublicVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(getServerData().vehicles[i].ownerType == VRR_VEHOWNER_PUBLIC) {
+	for (let i in getServerData().vehicles) {
+		if (getServerData().vehicles[i].ownerType == VRR_VEHOWNER_PUBLIC) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1255,8 +1255,8 @@ function respawnPublicVehiclesCommand(command, params, client) {
 // ===========================================================================
 
 function respawnBusinessVehiclesCommand(command, params, client) {
-	for(let i in getServerData().vehicles) {
-		if(getServerData().vehicles[i].ownerType == VRR_VEHOWNER_BIZ) {
+	for (let i in getServerData().vehicles) {
+		if (getServerData().vehicles[i].ownerType == VRR_VEHOWNER_BIZ) {
 			respawnVehicle(getServerData().vehicles[i].vehicle);
 		}
 	}
@@ -1278,13 +1278,13 @@ function stopRentingVehicle(client) {
 
 function respawnVehicle(vehicle) {
 	let vehicles = getServerData().vehicles;
-	for(let i in vehicles) {
-		if(vehicle == vehicles[i].vehicle) {
-			if(vehicles[i].spawnLocked == true) {
+	for (let i in vehicles) {
+		if (vehicle == vehicles[i].vehicle) {
+			if (vehicles[i].spawnLocked == true) {
 				vehicles[i].engine = false;
 			}
 
-			if(vehicles[i].ownerType == VRR_VEHOWNER_JOB) {
+			if (vehicles[i].ownerType == VRR_VEHOWNER_JOB) {
 				vehicles[i].locked = true;
 			}
 
@@ -1308,7 +1308,7 @@ function spawnVehicle(vehicleData) {
 	setVehicleHeading(vehicle, vehicleData.spawnRotation);
 	setElementTransient(vehicle, false);
 
-	if(!vehicle) {
+	if (!vehicle) {
 		return false;
 	}
 
@@ -1317,8 +1317,8 @@ function spawnVehicle(vehicleData) {
 
 	vehicleData.vehicle = vehicle;
 
-	if(isGameFeatureSupported("vehicleColours")) {
-		if(vehicleData.colour1IsRGBA && vehicleData.colour2IsRGBA) {
+	if (isGameFeatureSupported("vehicleColours")) {
+		if (vehicleData.colour1IsRGBA && vehicleData.colour2IsRGBA) {
 			vehicle.setRGBColours(vehicleData.colour1RGBA, vehicleData.colour2RGBA);
 			let colour1 = rgbaArrayFromToColour(vehicleData.colour1RGBA);
 			let colour2 = rgbaArrayFromToColour(vehicleData.colour2RGBA);
@@ -1330,14 +1330,14 @@ function spawnVehicle(vehicleData) {
 		}
 	}
 
-	if(vehicleData.spawnLocked == true) {
+	if (vehicleData.spawnLocked == true) {
 		setVehicleEngine(vehicle, false);
 		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to OFF`);
 	} else {
-		setVehicleEngine(vehicle, intToBool(vehicleData.engine));logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to ${toUpperCase(getOnOffFromBool(getVehicleEngine(vehicle)))}`);
+		setVehicleEngine(vehicle, intToBool(vehicleData.engine)); logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to ${toUpperCase(getOnOffFromBool(getVehicleEngine(vehicle)))}`);
 	}
 
-	if(typeof vehicle.locked != "undefined") {
+	if (typeof vehicle.locked != "undefined") {
 		setVehicleLocked(vehicle, intToBool(vehicleData.locked));
 		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s lock state to ${toUpperCase(getOnOffFromBool(getVehicleLocked(vehicle)))}`);
 	}
@@ -1358,8 +1358,8 @@ function spawnVehicle(vehicleData) {
 // ===========================================================================
 
 function isVehicleAtPayAndSpray(vehicle) {
-	for(let i in getServerData().payAndSprays[getGame()]) {
-		if(getDistance(getVehiclePosition(vehicle), getServerData().payAndSprays[getGame()][i].position) <= getGlobalConfig().payAndSprayDistance) {
+	for (let i in getServerData().payAndSprays[getGame()]) {
+		if (getDistance(getVehiclePosition(vehicle), getServerData().payAndSprays[getGame()][i].position) <= getGlobalConfig().payAndSprayDistance) {
 			return true;
 		}
 	}
@@ -1369,7 +1369,7 @@ function isVehicleAtPayAndSpray(vehicle) {
 // ===========================================================================
 
 function getVehicleOwnerTypeText(ownerType) {
-	switch(ownerType) {
+	switch (ownerType) {
 		case VRR_VEHOWNER_CLAN:
 			return "clan";
 
@@ -1393,7 +1393,7 @@ function getVehicleOwnerTypeText(ownerType) {
 // ===========================================================================
 
 function isVehicleOwnedByJob(vehicle, jobId) {
-	if(getVehicleData(vehicle).ownerType == VRR_VEHOWNER_JOB) {
+	if (getVehicleData(vehicle).ownerType == VRR_VEHOWNER_JOB) {
 		return (getVehicleData(vehicle).ownerId == jobId);
 	}
 	return false;
@@ -1402,8 +1402,8 @@ function isVehicleOwnedByJob(vehicle, jobId) {
 // ===========================================================================
 
 async function getPlayerNewVehicle(client) {
-	while(true) {
-		if(isPlayerInAnyVehicle(client)) {
+	while (true) {
+		if (isPlayerInAnyVehicle(client)) {
 			return getPlayerVehicle(client);
 		}
 		await null;
@@ -1414,7 +1414,7 @@ async function getPlayerNewVehicle(client) {
 
 function createNewDealershipVehicle(modelIndex, spawnPosition, spawnRotation, price, dealershipId, interior = 0, dimension = 0) {
 	let vehicle = createGameVehicle(modelIndex, spawnPosition, spawnRotation);
-	if(!vehicle) {
+	if (!vehicle) {
 		return false;
 	}
 	setVehicleHeading(vehicle, spawnRotation);
@@ -1434,7 +1434,7 @@ function createNewDealershipVehicle(modelIndex, spawnPosition, spawnRotation, pr
 	tempVehicleData.dimension = dimension;
 
 	let slot = getServerData().vehicles.push(tempVehicleData);
-	setEntityData(vehicle, "vrr.dataSlot", slot-1, false);
+	setEntityData(vehicle, "vrr.dataSlot", slot - 1, false);
 }
 
 // ===========================================================================
@@ -1451,7 +1451,7 @@ function createTemporaryVehicle(modelIndex, position, heading, interior = 0, dim
 	tempVehicleData.databaseId = -1;
 	tempVehicleData.interior = interior;
 	tempVehicleData.dimension = dimension;
-	if(!isGameFeatureSupported("vehicleColours")) {
+	if (!isGameFeatureSupported("vehicleColours")) {
 		tempVehicleData.colour1 = 0;
 		tempVehicleData.colour2 = 0;
 		tempVehicleData.colour3 = 0;
@@ -1459,7 +1459,7 @@ function createTemporaryVehicle(modelIndex, position, heading, interior = 0, dim
 	}
 
 	let slot = getServerData().vehicles.push(tempVehicleData);
-	setEntityData(vehicle, "vrr.dataSlot", slot-1, false);
+	setEntityData(vehicle, "vrr.dataSlot", slot - 1, false);
 
 	return vehicle;
 }
@@ -1477,7 +1477,7 @@ function createPermanentVehicle(modelIndex, position, heading, interior = 0, dim
 	tempVehicleData.model = modelIndex;
 	tempVehicleData.interior = interior;
 	tempVehicleData.dimension = dimension;
-	if(!isGameFeatureSupported("vehicleColours")) {
+	if (!isGameFeatureSupported("vehicleColours")) {
 		tempVehicleData.colour1 = 0;
 		tempVehicleData.colour2 = 0;
 		tempVehicleData.colour3 = 0;
@@ -1486,8 +1486,8 @@ function createPermanentVehicle(modelIndex, position, heading, interior = 0, dim
 
 	let slot = getServerData().vehicles.push(tempVehicleData);
 
-	if(areServerElementsSupported()) {
-		setEntityData(vehicle, "vrr.dataSlot", slot-1, false);
+	if (areServerElementsSupported()) {
+		setEntityData(vehicle, "vrr.dataSlot", slot - 1, false);
 	}
 
 
@@ -1497,12 +1497,12 @@ function createPermanentVehicle(modelIndex, position, heading, interior = 0, dim
 // ===========================================================================
 
 function processVehiclePurchasing() {
-	if(!getGlobalConfig().useServerSideVehiclePurchaseCheck) {
+	if (!getGlobalConfig().useServerSideVehiclePurchaseCheck) {
 		return false;
 	}
 
 	let purchasingVehicles = getServerData().purchasingVehicleCache;
-	for(let i in purchasingVehicles) {
+	for (let i in purchasingVehicles) {
 		checkVehiclePurchasing(purchasingVehicles[i]);
 	}
 
@@ -1512,28 +1512,28 @@ function processVehiclePurchasing() {
 // ===========================================================================
 
 function checkVehiclePurchasing(client) {
-	if(!isPlayerLoggedIn(client)) {
+	if (!isPlayerLoggedIn(client)) {
 		setPlayerBuyingVehicleState(client, VRR_VEHBUYSTATE_NONE, null, null);
 		return false;
 	}
 
-	if(!isPlayerSpawned(client)) {
+	if (!isPlayerSpawned(client)) {
 		setPlayerBuyingVehicleState(client, VRR_VEHBUYSTATE_NONE, null, null);
 		return false;
 	}
 
-	if(!getPlayerData(client)) {
+	if (!getPlayerData(client)) {
 		setPlayerBuyingVehicleState(client, VRR_VEHBUYSTATE_NONE, null, null);
 		return false;
 	}
 
-	if(!getPlayerData(client).buyingVehicle) {
+	if (!getPlayerData(client).buyingVehicle) {
 		setPlayerBuyingVehicleState(client, VRR_VEHBUYSTATE_NONE, null, null);
 		return false;
 	}
 
-	if(!isPlayerInAnyVehicle(client)) {
-		if(getPlayerData(client).buyingVehicle != false) {
+	if (!isPlayerInAnyVehicle(client)) {
+		if (getPlayerData(client).buyingVehicle != false) {
 			getServerData().purchasingVehicleCache.splice(getServerData().purchasingVehicleCache.indexOf(client), 1);
 			messagePlayerError(client, getLocaleString(client, "DealershipPurchaseExitedVehicle"));
 			respawnVehicle(getPlayerData(client).buyingVehicle);
@@ -1543,8 +1543,8 @@ function checkVehiclePurchasing(client) {
 		return false;
 	}
 
-	if(getDistance(getVehiclePosition(getPlayerData(client).buyingVehicle), getVehicleData(getPlayerData(client).buyingVehicle).spawnPosition) > getGlobalConfig().buyVehicleDriveAwayDistance) {
-		if(getPlayerCurrentSubAccount(client).cash < getVehicleData(getPlayerData(client).buyingVehicle).buyPrice) {
+	if (getDistance(getVehiclePosition(getPlayerData(client).buyingVehicle), getVehicleData(getPlayerData(client).buyingVehicle).spawnPosition) > getGlobalConfig().buyVehicleDriveAwayDistance) {
+		if (getPlayerCurrentSubAccount(client).cash < getVehicleData(getPlayerData(client).buyingVehicle).buyPrice) {
 			getServerData().purchasingVehicleCache.splice(getServerData().purchasingVehicleCache.indexOf(client), 1);
 			messagePlayerError(client, getLocaleString(client, "VehiclePurchaseNotEnoughMoney"));
 			respawnVehicle(getPlayerData(client).buyingVehicle);
@@ -1572,14 +1572,14 @@ function checkVehiclePurchasing(client) {
 // ===========================================================================
 
 function processVehicleBurning() {
-	if(!getGlobalConfig().useServerSideVehicleBurnCheck) {
+	if (!getGlobalConfig().useServerSideVehicleBurnCheck) {
 		return false;
 	}
 
 	let vehicles = getElementsByType(ELEMENT_VEHICLE);
-	for(let i in vehicles) {
-		if(vehicles[i].syncer == null) {
-			if(vehicles[i].health <= 250) {
+	for (let i in vehicles) {
+		if (vehicles[i].syncer == null) {
+			if (vehicles[i].health <= 250) {
 				vehicles[i].health = 250;
 			}
 		}
@@ -1589,11 +1589,11 @@ function processVehicleBurning() {
 // ===========================================================================
 
 function cacheAllVehicleItems() {
-	for(let i in getServerData().vehicles) {
-		for(let j in getServerData().items) {
-			if(getItemData(j).ownerType == VRR_ITEM_OWNER_VEHTRUNK && getItemData(j).ownerId == getServerData().vehicles[i].databaseId) {
+	for (let i in getServerData().vehicles) {
+		for (let j in getServerData().items) {
+			if (getItemData(j).ownerType == VRR_ITEM_OWNER_VEHTRUNK && getItemData(j).ownerId == getServerData().vehicles[i].databaseId) {
 				getServerData().vehicles[i].trunkItemCache.push(j);
-			} else if(getItemData(j).ownerType == VRR_ITEM_OWNER_VEHDASH && getItemData(j).ownerId == getServerData().vehicles[i].databaseId) {
+			} else if (getItemData(j).ownerType == VRR_ITEM_OWNER_VEHDASH && getItemData(j).ownerId == getServerData().vehicles[i].databaseId) {
 				getServerData().vehicles[i].dashItemCache.push(j);
 			}
 		}
@@ -1603,7 +1603,7 @@ function cacheAllVehicleItems() {
 // ===========================================================================
 
 function resetVehiclePosition(vehicle) {
-	if(!getVehicleData(vehicle).spawnLocked) {
+	if (!getVehicleData(vehicle).spawnLocked) {
 		getVehicleData(vehicle).spawnPosition = getVehiclePosition(vehicle);
 		getVehicleData(vehicle).spawnHeading = getVehiclePosition(vehicle);
 	}
@@ -1612,7 +1612,7 @@ function resetVehiclePosition(vehicle) {
 // ===========================================================================
 
 function setAllVehicleIndexes() {
-	for(let i in getServerData().vehicles) {
+	for (let i in getServerData().vehicles) {
 		getServerData().vehicles[i].index = i;
 	}
 }
@@ -1620,16 +1620,16 @@ function setAllVehicleIndexes() {
 // ===========================================================================
 
 function doesVehicleHaveMegaphone(vehicle) {
-	if(getVehicleData(vehicle).ownerType == VRR_VEHOWNER_JOB) {
-		if(getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)) == VRR_JOB_POLICE) {
+	if (getVehicleData(vehicle).ownerType == VRR_VEHOWNER_JOB) {
+		if (getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)) == VRR_JOB_POLICE) {
 			return true;
 		}
 
-		if(getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)) == VRR_JOB_FIRE) {
+		if (getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)) == VRR_JOB_FIRE) {
 			return true;
 		}
 
-		if(getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)) == VRR_JOB_MEDICAL) {
+		if (getJobType(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)) == VRR_JOB_MEDICAL) {
 			return true;
 		}
 	}
@@ -1641,8 +1641,8 @@ function doesVehicleHaveMegaphone(vehicle) {
 
 function getVehicleFromDatabaseId(databaseId) {
 	let vehicles = getServerData().vehicles;
-	for(let i in vehicles) {
-		if(vehicles[i].databaseId == databaseId) {
+	for (let i in vehicles) {
+		if (vehicles[i].databaseId == databaseId) {
 			return vehicles[i].vehicle;
 		}
 	}
@@ -1651,8 +1651,8 @@ function getVehicleFromDatabaseId(databaseId) {
 // ===========================================================================
 
 function isVehicleUnoccupied(vehicle) {
-	for(let i = 0 ; i <= 8 ; i++) {
-		if(vehicle.getOccupant(i) != null) {
+	for (let i = 0; i <= 8; i++) {
+		if (vehicle.getOccupant(i) != null) {
 			return true;
 		}
 	}
@@ -1677,8 +1677,8 @@ function getVehicleTrunkPosition(vehicle) {
 // ===========================================================================
 
 function removeAllOccupantsFromVehicle(vehicle) {
-	for(let i = 0 ; i <= 16 ; i++) {
-		if(vehicle.getOccupant(i) != null) {
+	for (let i = 0; i <= 16; i++) {
+		if (vehicle.getOccupant(i) != null) {
 			removePlayerFromVehicle(vehicle.getOccupant(i));
 		}
 	}
@@ -1687,7 +1687,7 @@ function removeAllOccupantsFromVehicle(vehicle) {
 // ===========================================================================
 
 function getVehicleColourInfoString(colour, isRGBA) {
-	if(isRGBA) {
+	if (isRGBA) {
 		let arrayColour = rgbaArrayFromToColour(colour);
 		return `RGBA [${arrayColour[0]}, ${arrayColour[1]}, ${arrayColour[2]}, ${arrayColour[3]}]`;
 	} else {