Merge remote-tracking branch 'refs/remotes/origin/dev' into v2.5.0

Author: Elimdur

events/mem_vazuran_menace.txt

@@ -865,7 +865,7 @@ country_event = {
 	title = mem_vazurans.8.name
 	desc = mem_vazurans.8.desc
 	picture = GFX_evt_nuclear_explosion
-	show_sound = TODO
+#	show_sound = TODO
 	location = FROM
 	is_triggered_only = yes
 
@@ -3847,20 +3847,20 @@ country_event = {
 }
 
 #Test Event to show Targets
-country_event = {
-	id = mem_vazurans.99
-	title = "vazuran Test"
-	desc = "All flags have been set"
-	picture = GFX_evt_mem_space_battle
-	
-	is_triggered_only = yes
-	
-	immediate = {
-		remove_point_of_interest = mem_vazurans_target.1
-		remove_point_of_interest = mem_vazurans_target.2
-		remove_point_of_interest = mem_vazurans_target.3
-		remove_point_of_interest = mem_vazurans_target.4
-		remove_point_of_interest = mem_vazurans_target.5
+#country_event = {
+#	id = mem_vazurans.99
+#	title = "vazuran Test"
+#	desc = "All flags have been set"
+#	picture = GFX_evt_mem_space_battle
+#	
+#	is_triggered_only = yes
+#	
+#	immediate = {
+#		remove_point_of_interest = mem_vazurans_target.1
+#		remove_point_of_interest = mem_vazurans_target.2
+#		remove_point_of_interest = mem_vazurans_target.3
+#		remove_point_of_interest = mem_vazurans_target.4
+#		remove_point_of_interest = mem_vazurans_target.5
 #		random_country = {
 #			limit = {
 #				has_country_flag = mem_vazurans_target_1
@@ -3921,9 +3921,9 @@ country_event = {
 #			desc = "mem_vazurans_target_5_desc"
 #			location = event_target:mem_vazurans_target_5
 #		}
-	}
-	
-	option = {
-		name = "OK"
-	}
-}
+#	}
+#	
+#	option = {
+#		name = "OK"
+#	}
+#}