Merge branch 'alpha' into fixes-gaming

code/game/objects/items/devices/taperecorder.dm

@@ -1,8 +1,8 @@
 /obj/item/device/taperecorder
 	name = "universal recorder"
 	desc = "A device that can record to cassette tapes, and play them. It automatically translates the content in playback."
-	icon_state = "taperecorder"
-	item_state = "analyzer"
+	icon_state = "taperecorder_idle"
+	item_state = "taperecorder_idle"
 	w_class = ITEM_SIZE_SMALL
 
 	matter = list(DEFAULT_WALL_MATERIAL = 60,"glass" = 30)

code/game/objects/structures/flora.dm

@@ -1,11 +1,13 @@
 //trees
+/obj/structure/flora
+	plane = ABOVE_HUMAN_PLANE
+	layer = ABOVE_HUMAN_LAYER
+
 /obj/structure/flora/tree
 	name = "tree"
 	anchored = 1
 	density = 1
 	pixel_x = -16
-	plane = ABOVE_HUMAN_PLANE
-	layer = ABOVE_HUMAN_LAYER
 
 /obj/structure/flora/tree/pine
 	name = "pine tree"

code/game/turfs/doodads/_flora.dm

@@ -4,6 +4,8 @@
 	icon = 'icons/obj/flora/ausflora.dmi'
 	icon_state = "firstbush_1"
 	anchored = 1
+	plane = ABOVE_HUMAN_PLANE
+	layer = ABOVE_HUMAN_LAYER
 
 /obj/effect/flora/New()
 	..()

code/modules/emotes/definitions/_mob.dm

@@ -121,6 +121,42 @@
 		/decl/emote/visible/dap,
 		/decl/emote/visible/signal,
 		/decl/emote/visible/handshake,
+		/decl/emote/audible/species_sound/alert1,
+		/decl/emote/audible/species_sound/alert2,
+		/decl/emote/audible/species_sound/alert3,
+		/decl/emote/audible/species_sound/alert4,
+		/decl/emote/audible/species_sound/berserk1,
+		/decl/emote/audible/species_sound/berserk2,
+		/decl/emote/audible/species_sound/berserk3,
+		/decl/emote/audible/species_sound/berserk4,
+		/decl/emote/audible/species_sound/charge1,
+		/decl/emote/audible/species_sound/charge2,
+		/decl/emote/audible/species_sound/charge3,
+		/decl/emote/audible/species_sound/charge4,
+		/decl/emote/audible/species_sound/curse1,
+		/decl/emote/audible/species_sound/curse2,
+		/decl/emote/audible/species_sound/curse3,
+		/decl/emote/audible/species_sound/curse4,
+		/decl/emote/audible/species_sound/gloat1,
+		/decl/emote/audible/species_sound/gloat2,
+		/decl/emote/audible/species_sound/gloat3,
+		/decl/emote/audible/species_sound/gloat4,
+		/decl/emote/audible/species_sound/medic1,
+		/decl/emote/audible/species_sound/oorah1,
+		/decl/emote/audible/species_sound/oorah2,
+		/decl/emote/audible/species_sound/oorah3,
+		/decl/emote/audible/species_sound/oorah4,
+		/decl/emote/audible/species_sound/taunt1,
+		/decl/emote/audible/species_sound/taunt2,
+		/decl/emote/audible/species_sound/taunt3,
+		/decl/emote/audible/species_sound/taunt4,
+		/decl/emote/audible/species_sound/femalert1,
+		/decl/emote/audible/species_sound/femberserk1,
+		/decl/emote/audible/species_sound/femcurse1,
+		/decl/emote/audible/species_sound/femgloat1,
+		/decl/emote/audible/species_sound/femmedic1,
+		/decl/emote/audible/species_sound/femoorah1,
+		/decl/emote/audible/species_sound/femtaunt1,
 		/decl/emote/audible/species_sound/wort,
 		/decl/emote/audible/species_sound/need_weapon,
 		/decl/emote/audible/species_sound/aim,

code/modules/halo/Forerunner/airlocks/doors.dm

@@ -0,0 +1,12 @@
+
+/obj/machinery/door/airlock/forerunner
+	name = "Airlock"
+	icon = 'code/modules/halo/Forerunner/airlocks/door32.dmi'
+	welded_file = null
+	lights_file = null
+	fill_file = null
+	maxhealth = 1500
+
+	open_sound_powered = 'code/modules/halo/sounds/airlock_sounds/forerunnerdoor32open.ogg'
+	close_sound_powered = 'code/modules/halo/sounds/airlock_sounds/forerunnerdoor32close.ogg'
+

code/modules/halo/Forerunner/sentinel.dm

@@ -127,6 +127,15 @@
 
 	return ..()
 
+/mob/living/simple_animal/hostile/sentinel/major
+	name = "Sentinel Major"
+	desc = "An automated defence drone made of advanced alien technology, this one seems to be a more advanced variant."
+	icon_state = "sentinel_major"
+	icon_living = "sentinel_major"
+	icon_dead = "sentinel_major_dead"
+	health = 200
+	maxHealth = 200
+
 /mob/living/simple_animal/hostile/sentinel/player_sentinel
 	name = "Sentinel"
 	desc = "An automated defence drone made of advanced alien technology. This one seems to posses some higher-thought functions."

code/modules/halo/abilities/flight.dm

@@ -1,5 +1,6 @@
 
 //#define YANMEE_FLIGHT_TICKS 80
+#define FLIGHT_LAND_NOMOVE_TIME 2 SECONDS
 
 /mob/living
 	var/flight_ticks_remain = 0 //Movement and life() ticks degrade this. Set by Yanme'e flight and jump-packs
@@ -28,14 +29,19 @@
 		if(message_flight)
 			visible_message("[message_flight]")
 	else
-		Stun(2)
+		if(canmove)
+			canmove = 0
+			spawn(FLIGHT_LAND_NOMOVE_TIME)
+				canmove = 1
 		flight_ticks_remain = 0
 		change_elevation(-flight_elevation)
 		if(message_land)
 			visible_message("[message_land]")
 		if(istype(loc,/turf/simulated/open))
 			fall()
 
+#undef FLIGHT_LAND_NOMOVE_TIME
+
 /*
 /mob/living/carbon/human/proc/yanmee_flight_ability()
 	set category = "Abilities"

code/modules/halo/covenant/structures_machines/covvendors.dm

@@ -136,6 +136,7 @@
 		/obj/item/weapon/pickaxe/plasma_drill = 0,
 		/obj/item/flight_item/covenant_pack = 0,
 		/obj/item/dumb_ai_chip/cov = 0,
+		/obj/item/device/flashlight/covenant = 0,
 		/obj/item/stack/barbedwire/covenant/fifteen = 0,
 		/obj/item/weapon/plastique/covenant = 0,
 		/obj/item/weapon/plastique/breaching/covenant = 0,
@@ -159,6 +160,7 @@
 		/obj/item/weapon/pickaxe/plasma_drill = 1,
 		/obj/item/flight_item/covenant_pack = 1,
 		/obj/item/dumb_ai_chip/cov = 2,
+		/obj/item/device/flashlight/covenant = 3,
 		/obj/item/stack/barbedwire/covenant/fifteen = 5,
 		/obj/item/weapon/plastique/covenant = 8,
 		/obj/item/weapon/plastique/breaching/covenant = 5,
@@ -241,6 +243,7 @@
 		/obj/item/clothing/under/covenant/jiralhanae/straps = 0,
 		/obj/item/flight_item/covenant_pack = 0,
 		/obj/item/dumb_ai_chip/cov = 0,
+		/obj/item/device/flashlight/covenant = 0,
 		/obj/item/stack/barbedwire/covenant/fifteen = 0,
 		/obj/item/weapon/plastique/covenant = 0,
 		/obj/item/weapon/plastique/breaching/covenant = 0,
@@ -263,6 +266,7 @@
 		/obj/item/weapon/pickaxe/plasma_drill = 1,
 		/obj/item/flight_item/covenant_pack = 1,
 		/obj/item/dumb_ai_chip/cov = 2,
+		/obj/item/device/flashlight/covenant = 3,
 		/obj/item/stack/barbedwire/covenant/fifteen = 5,
 		/obj/item/weapon/plastique/covenant = 8,
 		/obj/item/weapon/plastique/breaching/covenant = 5,
@@ -343,6 +347,7 @@
 		/obj/item/clothing/under/kigyar/variant = 0,
 		/obj/item/clothing/under/kigyar/variant/one = 0,
 		/obj/item/clothing/under/kigyar/variant/two = 0,
+		/obj/item/device/flashlight/covenant = 0,
 		/obj/item/weapon/pickaxe/plasma_drill = 0,
 		/obj/item/stack/barbedwire/covenant/fifteen = 0,
 		/obj/item/weapon/plastique/covenant = 0,
@@ -363,6 +368,7 @@
 	amounts = list(\
 		/obj/item/flight_item/covenant_pack = 1,
 		/obj/item/clothing/gloves/shield_gauntlet/kigyar = 6,
+		/obj/item/device/flashlight/covenant = 3,
 		/obj/item/stack/barbedwire/covenant/fifteen = 5,
 		/obj/item/weapon/pickaxe/plasma_drill = 1,
 		/obj/item/weapon/plastique/covenant = 6,
@@ -447,6 +453,7 @@
 		/obj/item/weapon/storage/pocketstore/hardcase/tools/cov = 0,
 		"Equipment" = -1,
 		/obj/item/clothing/ears/earmuffs/earplugs/covenant = 0,
+		/obj/item/device/flashlight/covenant = 0,
 		/obj/item/weapon/pickaxe/plasma_drill = 0,
 		/obj/item/stack/barbedwire/covenant/fifteen = 0,
 		/obj/item/weapon/plastique/covenant = 0,
@@ -460,6 +467,7 @@
 	)
 	amounts = list(\
 		/obj/item/weapon/pickaxe/plasma_drill = 1,
+		/obj/item/device/flashlight/covenant = 3,
 		/obj/item/stack/barbedwire/covenant/fifteen = 5,
 		/obj/item/weapon/plastique/covenant = 6,
 		/obj/item/weapon/plastique/breaching/covenant = 4,
@@ -497,6 +505,7 @@
 		/obj/item/weapon/storage/pocketstore/hardcase/tools/cov = 0,
 		"Equipment" = -1,
 		/obj/item/clothing/ears/earmuffs/earplugs/covenant = 0,
+		/obj/item/device/flashlight/covenant = 0,
 		/obj/item/weapon/pickaxe/plasma_drill = 0,
 		/obj/item/stack/barbedwire/covenant/fifteen = 0,
 		/obj/item/weapon/plastique/covenant = 0,
@@ -508,6 +517,7 @@
 		/obj/item/drop_pod_beacon/covenant = 0
 	)
 	amounts = list(\
+		/obj/item/device/flashlight/covenant = 3,
 		/obj/item/weapon/pickaxe/plasma_drill = 1,
 		/obj/item/stack/barbedwire/covenant/fifteen = 5,
 		/obj/item/weapon/plastique/covenant = 6,
@@ -658,3 +668,7 @@
 	/obj/item/weapon/reagent_containers/blood/empty = 12,
 	/obj/item/weapon/reagent_containers/spray/cleaner = 2
 	)
+
+/obj/machinery/smartfridge/chemistry/covenant
+	icon = 'code/modules/halo/covenant/structures_machines/smartfridge.dmi'
+	icon_state = "smartfridge"

code/modules/halo/covenant/structures_machines/newscaster.dm

@@ -0,0 +1,4 @@
+
+/obj/machinery/newscaster/covenant
+	icon = 'code/modules/halo/covenant/structures_machines/newscaster.dmi'
+	icon_state = "newscaster_normal"

code/modules/halo/covenant/supply/covvehicles.dm

@@ -3,8 +3,6 @@
 	faction_lock = "Covenant"
 	containertype = null
 
-/* MELEE */
-
 /decl/hierarchy/supply_pack/covenant_vehicles/goblin
 	name = "Pnap-Pattern Battlesuit"
 	contains = list(/obj/vehicles/goblin = 1)

code/modules/halo/doors/halo_doors.dm

@@ -16,3 +16,6 @@
 	icon = 'code/modules/halo/doors/airlockmaint/airlockmaint_iso.dmi'
 	glass = 1
 	glass_file = null
+
+	open_sound_powered = 'code/modules/halo/sounds/airlock_sounds/maintenance32open.ogg'
+	close_sound_powered = 'code/modules/halo/sounds/airlock_sounds/maintenance32close.ogg'