Merge pull request #3531 from YourPalHolidays/alpha

Dropship Move Sound Effects & Swamp Tree Icon Fix

code/modules/halo/flora/swamp_tree.dm

@@ -4,6 +4,7 @@
 /obj/structure/flora/tree/swamp_tree
 	name = "glowing tree"
 	desc = "A large, sturdy, glowing tree."
+	icon = 'code/modules/halo/icons/flora/swamp_tree.dmi'
 	anchored = 1
 	density = 1
 

code/modules/halo/vehicles/types/pelican.dm

@@ -99,6 +99,8 @@
 
 	overmap_range = 10
 
+	move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'
+
 	takeoff_overlay_icon_state = "thrust"
 	takeoff_sound = 'code/modules/halo/shuttles/pelican_takeoff.ogg'
 
@@ -131,6 +133,8 @@
 /obj/vehicles/air/overmap/pelican/unsc
 	faction = "UNSC"
 
+	move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'
+
 	spawn_datum = /datum/mobile_spawn/unsc
 
 /obj/vehicles/air/overmap/pelican/urf
@@ -140,6 +144,8 @@
 	desc = "A versatile aircraft used by the UNSC for medium-lift operations of personnel, vehicles and equipment. This one has a red fist painted onto the armor. A 40mm Chain-Gun is mounted on the nose."
 	faction = "Insurrection"
 
+	move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'
+
 	comp_prof = /datum/component_profile/pelican/urf
 
 	ammo_containers = newlist(/obj/item/ammo_magazine/pelican_chaingun)
@@ -183,6 +189,8 @@
 	faction = "police"
 	occupants = list(6,0)
 
+	move_sound = 'code/modules/halo/sounds/vehicle_sfx/pelican_move.ogg'
+
 	comp_prof = /datum/component_profile/pelican/civ
 
 /obj/item/vehicle_component/health_manager/pelican/civ

code/modules/halo/vehicles/types/phantom_dropship.dm

@@ -19,6 +19,8 @@
 	takeoff_sound = null
 	overmap_range = 10
 
+	move_sound = 'code/modules/halo/sounds/vehicle_sfx/phantom_move.ogg'
+
 	comp_prof = /datum/component_profile/phantom
 
 	spawn_datum = /datum/mobile_spawn/covenant