diff --git a/SQF/dayz_server/compile/spawn_vehicles.sqf b/SQF/dayz_server/compile/spawn_vehicles.sqf
index 363990996..a740e4d30 100644
--- a/SQF/dayz_server/compile/spawn_vehicles.sqf
+++ b/SQF/dayz_server/compile/spawn_vehicles.sqf
@@ -1,7 +1,5 @@
-private ["_random","_lastIndex","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition","_iClass","_num","_allCfgLoots"];
+private ["_random","_lastIndex","_index","_vehicle","_velimit","_qty","_isCessna","_isMV22","_isShip","_isHeli","_isC130","_isPlane","_position","_dir","_istoomany","_veh","_objPosition","_iClass","_num","_allCfgLoots"];
 // do not make _roadList, _buildingList or _serverVehicleCounter private in this function
-#include "\z\addons\dayz_code\util\Math.hpp"
-#include "\z\addons\dayz_code\util\Vector.hpp"
 #include "\z\addons\dayz_code\loot\Loot.hpp"
 
 while {count AllowedVehiclesList > 0} do {
@@ -28,21 +26,35 @@ if (count AllowedVehiclesList == 0) then {
 	_serverVehicleCounter set [count _serverVehicleCounter,_vehicle];
 
 	// Find Vehicle Type to better control spawns
-	_isAir = _vehicle isKindOf "Air";
-	_isShip = _vehicle isKindOf "Ship";
-
-	if (_isShip or _isAir) then {
-		if (_isShip) then {
-			// Spawn anywhere on coast on water
-			_position = [getMarkerPos "center",0,((getMarkerSize "center") select 1),10,1,2000,1] call BIS_fnc_findSafePos;
-			//diag_log("DEBUG: spawning boat near coast " + str(_position));
-		} else {
-			// Spawn air anywhere that is flat
-			_position = [getMarkerPos "center",0,((getMarkerSize "center") select 1),10,0,2000,0] call BIS_fnc_findSafePos;
-			//diag_log("DEBUG: spawning air anywhere flat " + str(_position));
+	_isShip = _vehicle isKindOf "Ship"; // Any type of watercraft.
+	_isMV22 = _vehicle == "MV22_DZ"; // MV-22 is classified as a plane but it can take off vertically, so it is treated as a helicopter.
+	_isHeli = _vehicle isKindOf "Helicopter"; // All helicopters.
+	_isC130 = _vehicle == "C130J_US_EP1_DZ"; // C130s are too large to spawn in hangars.
+	_isCessna = _vehicle in ["GNT_C185C_DZ","GNT_C185R_DZ","GNT_C185_DZ","GNT_C185U_DZ"]; // Cessna models are unstable and should not spawn in hangars.
+	_isPlane = (_vehicle isKindOf "Plane" && {!_isCessna} && {!_isMV22} && {!_isC130}); // Cessna, MV-22, and C130 not allowed to spawn in hangars.
+	
+	call {
+		// Spawn boats anywhere on coast on water
+		if (_isShip) exitWith {_position = [getMarkerPos "center",0,((getMarkerSize "center") select 1),10,1,2000,1] call BIS_fnc_findSafePos;};
+		// Spawn helicopters anywhere that is relatively flat
+		if (_isHeli || {_isMV22}) exitWith {_position = [getMarkerPos "center",0,((getMarkerSize "center") select 1),10,0,.15,0] call BIS_fnc_findSafePos;};
+		// Spawn AN2 and GyroCopter in hangar and runway positions
+		if (_isPlane) exitWith {
+			if (count DZE_AllAircraftPositions > 0) then { // Custom airfield positions available
+				_position = DZE_AllAircraftPositions call BIS_fnc_selectRandom; _dir = _position select 1; _position = _position select 0;
+			} else {
+				_position = [getMarkerPos "center",0,((getMarkerSize "center") select 1),10,0,.15,0] call BIS_fnc_findSafePos;
+			};
 		};
-	} else {
-		// Spawn around buildings and 50% near roads
+		// Spawn C130 and Cessna on runway positions
+		if (_isCessna || {_isC130}) exitWith {
+			if (count DZE_Runway_Positions > 0) then { // Custom airfield positions available
+				_position = DZE_Runway_Positions call BIS_fnc_selectRandom; _dir = _position select 1; _position = _position select 0;
+			} else {
+				_position = [getMarkerPos "center",0,((getMarkerSize "center") select 1),10,0,.15,0] call BIS_fnc_findSafePos;
+			};
+		};
+		// Spawn land vehicles around buildings and 50% near roads
 		if ((random 1) > 0.5) then {	
 			_position = _roadList call BIS_fnc_selectRandom;	
 			_position = _position modelToWorld [0,0,0];	
@@ -55,10 +67,13 @@ if (count AllowedVehiclesList == 0) then {
 			//diag_log("DEBUG: spawning around buildings " + str(_position));
 		};
 	};
+	
 	// only proceed if two params otherwise BIS_fnc_findSafePos failed and may spawn in air
 	if ((count _position) == 2) then {
 		_position set [2,0];
-		_dir = round(random 180);
+		if (isNil "_dir") then {
+			_dir = round(random 180);
+		};
 		_istoomany = _position nearObjects ["AllVehicles",50];
 		if ((count _istoomany) > 0) exitWith {};
 	
@@ -71,7 +86,7 @@ if (count AllowedVehiclesList == 0) then {
 	
 		clearWeaponCargoGlobal  _veh;
 		clearMagazineCargoGlobal  _veh;
-
+		
 		// Add 0-3 loots to vehicle using random loot groups
 		_num = floor(random 4);
 		_allCfgLoots = ["Trash","Trash","Consumable","Consumable","Generic","Generic","MedicalLow","MedicalLow","clothes","tents","backpacks","Parts","pistols","AmmoCivilian"];
@@ -88,4 +103,4 @@ if (count AllowedVehiclesList == 0) then {
 			_vehiclesToUpdate set [count _vehiclesToUpdate,_veh];
 		};
 	};
-};
\ No newline at end of file
+};