Add missing sounds, redo biohazard alerts, and station intro.

baystation12.dme

@@ -179,6 +179,7 @@
 #include "code\defines\obj\hydro.dm"
 #include "code\defines\obj\weapon.dm"
 #include "code\defines\procs\AStar.dm"
+#include "code\defines\procs\biohazard_alert.dm"
 #include "code\defines\procs\captain_announce.dm"
 #include "code\defines\procs\command_alert.dm"
 #include "code\defines\procs\dbcore.dm"

code/defines/vox_sounds.dm

@@ -122,6 +122,7 @@ var/list/vox_sounds = list(
 	"capture" = 'sound/vox_fem/capture.ogg',
 	"cargo" = 'sound/vox_fem/cargo.ogg',
 	"catbeast" = 'sound/vox_fem/catbeast.ogg',
+	"ce" = 'sound/vox_fem/ce.ogg',
 	"ceiling" = 'sound/vox_fem/ceiling.ogg',
 	"celsius" = 'sound/vox_fem/celsius.ogg',
 	"centcomm" = 'sound/vox_fem/centcomm.ogg',
@@ -139,12 +140,15 @@ var/list/vox_sounds = list(
 	"chef" = 'sound/vox_fem/chef.ogg',
 	"chefs" = 'sound/vox_fem/chefs.ogg',
 	"chemical" = 'sound/vox_fem/chemical.ogg',
+	"chemist" = 'sound/vox_fem/chemist.ogg',
+	"chemists" = 'sound/vox_fem/chemists.ogg',
 	"cleanup" = 'sound/vox_fem/cleanup.ogg',
 	"clear" = 'sound/vox_fem/clear.ogg',
 	"clearance" = 'sound/vox_fem/clearance.ogg',
 	"close" = 'sound/vox_fem/close.ogg',
 	"clown" = 'sound/vox_fem/clown.ogg',
 	"clowns" = 'sound/vox_fem/clowns.ogg',
+	"cmo" = 'sound/vox_fem/cmo.ogg',
 	"code" = 'sound/vox_fem/code.ogg',
 	"coded" = 'sound/vox_fem/coded.ogg',
 	"collider" = 'sound/vox_fem/collider.ogg',
@@ -192,8 +196,11 @@ var/list/vox_sounds = list(
 	"degrees" = 'sound/vox_fem/degrees.ogg',
 	"delta" = 'sound/vox_fem/delta.ogg',
 	"denied" = 'sound/vox_fem/denied.ogg',
+	"department" = 'sound/vox_fem/department.ogg',
+	"departments" = 'sound/vox_fem/departments.ogg',
 	"deploy" = 'sound/vox_fem/deploy.ogg',
 	"deployed" = 'sound/vox_fem/deployed.ogg',
+	"desk" = 'sound/vox_fem/desk.ogg',
 	"destroy" = 'sound/vox_fem/destroy.ogg',
 	"destroyed" = 'sound/vox_fem/destroyed.ogg',
 	"detain" = 'sound/vox_fem/detain.ogg',
@@ -211,6 +218,7 @@ var/list/vox_sounds = list(
 	"distortion" = 'sound/vox_fem/distortion.ogg',
 	"do" = 'sound/vox_fem/do.ogg',
 	"doctor" = 'sound/vox_fem/doctor.ogg',
+	"doctors" = 'sound/vox_fem/doctors.ogg',
 	"doop" = 'sound/vox/doop.wav',
 	"door" = 'sound/vox_fem/door.ogg',
 	"dorms" = 'sound/vox_fem/dorms.ogg',
@@ -341,6 +349,8 @@ var/list/vox_sounds = list(
 	"highest" = 'sound/vox_fem/highest.ogg',
 	"hit" = 'sound/vox_fem/hit.ogg',
 	"hole" = 'sound/vox_fem/hole.ogg',
+	"hop" = 'sound/vox_fem/hop.ogg',
+	"hos" = 'sound/vox_fem/hos.ogg',
 	"hostile" = 'sound/vox_fem/hostile.ogg',
 	"hot" = 'sound/vox_fem/hot.ogg',
 	"hotel" = 'sound/vox_fem/hotel.ogg',
@@ -540,9 +550,11 @@ var/list/vox_sounds = list(
 	"raider" = 'sound/vox_fem/raider.ogg',
 	"raiders" = 'sound/vox_fem/raiders.ogg',
 	"rapid" = 'sound/vox_fem/rapid.ogg',
+	"rd" = 'sound/vox_fem/rd.ogg',
 	"reach" = 'sound/vox_fem/reach.ogg',
 	"reached" = 'sound/vox_fem/reached.ogg',
 	"reactor" = 'sound/vox_fem/reactor.ogg',
+	"recommend" = 'sound/vox_fem/recommend.ogg',
 	"red" = 'sound/vox_fem/red.ogg',
 	"relay" = 'sound/vox_fem/relay.ogg',
 	"released" = 'sound/vox_fem/released.ogg',
@@ -552,6 +564,7 @@ var/list/vox_sounds = list(
 	"repair" = 'sound/vox_fem/repair.ogg',
 	"report" = 'sound/vox_fem/report.ogg',
 	"reports" = 'sound/vox_fem/reports.ogg',
+	"request" = 'sound/vox_fem/request.ogg',
 	"requested" = 'sound/vox_fem/requested.ogg',
 	"required" = 'sound/vox_fem/required.ogg',
 	"research" = 'sound/vox_fem/research.ogg',

code/game/gamemodes/blob/blob.dm

@@ -144,23 +144,21 @@ You must kill it all while minimizing the damage to the station."}
 		// Stage 1
 		sleep(2000)
 		stage(1)
-
 	..()
 
 /datum/game_mode/blob/proc/stage(var/stage)
 
 	switch(stage)
 		if (0)
-			send_intercept(1)
+			biohazard_alert()
 			declared = 1
 			return
 
 		if (1)
-			command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+			command_alert("Biohazard outbreak alert status upgraded to level 9.  [station_name()] is now locked down, under Directive 7-10, until further notice.", "Directive 7-10 Initiated")
 			for(var/mob/M in player_list)
 				if(!istype(M,/mob/new_player))
-					M << sound('sound/AI/outbreak5.ogg')
+					M << sound('sound/AI/blob_confirmed.ogg')
-			return
 
 	return
 

code/game/gamemodes/events.dm

@@ -178,9 +178,7 @@
 			H.viruses += D
 			break
 	spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes.
-		command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+		biohazard_alert()
-		for(var/mob/M in player_list)
-			M << sound('sound/AI/outbreak7.ogg')
 
 /proc/alien_infestation(var/spawncount = 1) // -- TLE
 	//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")

code/game/gamemodes/gameticker.dm

@@ -138,7 +138,20 @@ var/global/datum/controller/gameticker/ticker
 			if (S.name != "AI")
 				del(S)
 		world << "<FONT color='blue'><B>Enjoy the game!</B></FONT>"
-		world << sound('sound/AI/welcome.ogg') // Skie
+		//world << sound('sound/AI/welcome.ogg') // Skie //Out with the old, in with the new. - N3X15
+		var/welcome_sentence=list('sound/AI/vox_login.ogg')
+		welcome_sentence += pick(
+			'sound/AI/vox_reminder1.ogg',
+			'sound/AI/vox_reminder2.ogg',
+			'sound/AI/vox_reminder3.ogg',
+			'sound/AI/vox_reminder4.ogg',
+			'sound/AI/vox_reminder5.ogg',
+			'sound/AI/vox_reminder6.ogg',
+			'sound/AI/vox_reminder7.ogg',
+			'sound/AI/vox_reminder8.ogg',
+			'sound/AI/vox_reminder9.ogg')
+		for(var/sound in welcome_sentence)
+			play_vox_sound(sound,STATION_Z,null)
 		//Holiday Round-start stuff	~Carn
 		Holiday_Game_Start()
 

code/modules/events/blob.dm

@@ -97,8 +97,7 @@
 					infected_crew += core.overmind.mind
 
 		sleep(100) // 10s
-		command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+		biohazard_alert()
-		world << sound('sound/AI/outbreak7.ogg')
 
 /datum/event/blob/proc/greetblob(user)
 	user << {"<B>\red You are infected by the Blob!</B>

code/modules/events/disease_outbreak.dm

@@ -4,8 +4,7 @@
 
 
 /datum/event/disease_outbreak/announce()
-	command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+	biohazard_alert()
-	world << sound('sound/AI/outbreak7.ogg')
 
 /datum/event/disease_outbreak/setup()
 	announceWhen = rand(15, 30)

code/modules/events/organ_failure.dm

@@ -7,9 +7,7 @@ datum/event/organ_failure/setup()
 	severity = rand(1, 3)
 
 datum/event/organ_failure/announce()
-	command_alert("Confirmed outbreak of level [rand(3,7)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+	biohazard_alert(rand(3,7))
-	world << sound('sound/AI/outbreak5.ogg')
-
 datum/event/organ_failure/start()
 	var/list/candidates = list()	//list of candidate keys
 	for(var/mob/living/carbon/human/G in player_list)

code/modules/events/viral_infection.dm

@@ -8,8 +8,7 @@ datum/event/viral_infection/setup()
 	severity = rand(1, 3)
 
 datum/event/viral_infection/announce()
-	command_alert("Confirmed outbreak of level five biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+	biohazard_alert()
-	world << sound('sound/AI/outbreak5.ogg')
 
 datum/event/viral_infection/start()
 	var/list/candidates = list()	//list of candidate keys

code/modules/events/viral_outbreak.dm

@@ -8,8 +8,7 @@ datum/event/viral_outbreak/setup()
 	severity = rand(2, 4)
 
 datum/event/viral_outbreak/announce()
-	command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+	biohazard_alert()
-	world << sound('sound/AI/outbreak7.ogg')
 
 datum/event/viral_outbreak/start()
 	var/list/candidates = list()	//list of candidate keys

code/modules/mob/living/carbon/zombie/zombie.dm

@@ -535,7 +535,7 @@ datum/reagent/zed
 //			return
 
 	if(usr) message_admins("[key_name_admin(usr)] has spawned a zombie", 1)
-//	command_alert("Confirmed outbreak of level 13 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
+	biohazard_alert(7)
 	var/list/t = list()
 	for(var/obj/landmark/zspawn/O in world)
 		t += O

code/modules/mob/living/silicon/ai/say.dm

@@ -109,26 +109,24 @@ var/const/VOX_DELAY = 600
 
 
 /proc/play_vox_word(var/word, var/z_level, var/mob/only_listener)
-
 	word = lowertext(word)
-
 	if(vox_sounds[word])
-
+		return play_vox_sound(vox_sounds[word],z_level,only_listener)
-		var/sound_file = vox_sounds[word]
-		var/sound/voice = sound(sound_file, wait = 1, channel = VOX_CHANNEL)
-		voice.status = SOUND_STREAM
-
- 		// If there is no single listener, broadcast to everyone in the same z level
-		if(!only_listener)
-			// Play voice for all mobs in the z level
-			for(var/mob/M in player_list)
-				if(M.client)
-					var/turf/T = get_turf(M)
-					if(T.z == z_level)
-						M << voice
-		else
-			only_listener << voice
-		return 1
 	return 0
 
-// VOX sounds moved to /code/defines/vox_sounds.dm
+
+/proc/play_vox_sound(var/sound_file, var/z_level, var/mob/only_listener)
+	var/sound/voice = sound(sound_file, wait = 1, channel = VOX_CHANNEL)
+	voice.status = SOUND_STREAM
+
+	// If there is no single listener, broadcast to everyone in the same z level
+	if(!only_listener)
+		// Play voice for all mobs in the z level
+		for(var/mob/M in player_list)
+			if(M.client)
+				var/turf/T = get_turf(M)
+				if(T.z == z_level)
+					M << voice
+	else
+		only_listener << voice
+	return 1