Merge pull request #635 from dwasint/rev-fix

removes saturnx blur

code/controllers/subsystem/vote.dm

@@ -206,7 +206,9 @@ SUBSYSTEM_DEF(vote)
 		if(vote_initiator)
 			to_chat(vote_initiator, span_warning("Invalid voting choice."))
 		return FALSE
-
+
+	if(!to_vote.player_startable)
+		return FALSE
 	// Vote can't be initiated in our circumstances? No vote
 	if(!to_vote.can_be_initiated(vote_initiator, unlimited_vote_power))
 		return FALSE

code/datums/votes/_vote_datum.dm

@@ -33,6 +33,8 @@
 
 	/// Multipliers donators get for this vote type
 	var/donator_multiplier = 0
+	// can we start this vote by a player
+	var/player_startable = TRUE
 
 /**
  * Used to determine if this vote is a possible
@@ -78,6 +80,8 @@
  */
 /datum/vote/proc/can_be_initiated(mob/by_who, forced = FALSE)
 	SHOULD_CALL_PARENT(TRUE)
+	if(!player_startable)
+		return FALSE
 
 	if(started_time)
 		var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay))

code/modules/mob/dead/new_player/login.dm

@@ -18,6 +18,9 @@
 	if (!client.holder && CONFIG_GET(flag/panic_bunker) && CONFIG_GET(flag/panic_bunker_interview) && !(client.ckey in GLOB.interviews.approved_ckeys))
 		var/required_living_minutes = CONFIG_GET(number/panic_bunker_living)
 		var/living_minutes = client.get_exp_living(TRUE)
+		if(client.player_age != -1)
+			if(!max(0, 14 - client.player_age))
+				client.interviewee = TRUE
 		if(!CONFIG_GET(flag/minimum_account_age))
 			if (required_living_minutes >= living_minutes)
 				client.interviewee = TRUE

code/modules/reagents/chemistry/reagents/drug_reagents.dm

@@ -712,12 +712,6 @@
 		animate(color = col_filter_half, time = 24 SECONDS, easing = CIRCULAR_EASING|EASE_IN)
 		animate(color = col_filter_twothird, time = 12 SECONDS, easing = LINEAR_EASING)
 
-	game_plane_master_controller.add_filter("saturnx_blur", 1, list("type" = "radial_blur", "size" = 0))
-
-	for(var/filter in game_plane_master_controller.get_filters("saturnx_blur"))
-		animate(filter, loop = -1, size = 0.04, time = 2 SECONDS, easing = ELASTIC_EASING|EASE_OUT, flags = ANIMATION_PARALLEL)
-		animate(size = 0, time = 6 SECONDS, easing = CIRCULAR_EASING|EASE_IN)
-
 ///This proc turns the living mob passed as the arg "invisible_man"s invisible by giving him the invisible man trait and updating his body, this changes the sprite of all his organic limbs to a 1 alpha version.
 /datum/reagent/drug/saturnx/proc/turn_man_invisible(mob/living/carbon/invisible_man, requires_liver = TRUE)
 	if(requires_liver)
@@ -760,7 +754,6 @@
 
 	var/atom/movable/plane_master_controller/game_plane_master_controller = invisible_man.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
 	game_plane_master_controller.remove_filter("saturnx_filter")
-	game_plane_master_controller.remove_filter("saturnx_blur")
 
 /datum/reagent/drug/saturnx/overdose_process(mob/living/invisible_man, seconds_per_tick, times_fired)
 	. = ..()

monkestation/code/modules/goonimizations/shuttle_votes.dm

@@ -18,21 +18,26 @@ SUBSYSTEM_DEF(autotransfer)
 	if(length(GLOB.player_list) < 25)
 		return
 	if(world.time > targettime)
-		if(called)
+		if(EMERGENCY_ESCAPED_OR_ENDGAMED)
+			return
+		if(called || SSshuttle.emergency.mode == SHUTTLE_CALL || SSshuttle.emergency.mode == SHUTTLE_DOCKED)
 			return
 		SSvote.initiate_vote(/datum/vote/shuttle_call, "automatic shuttle vote")
 		targettime = targettime + 20 MINUTES
 
 /datum/vote/shuttle_call
 	name = "Call Shuttle"
 	message = "Should we go home?!"
+	default_choices = list("Yes", "No")
+	player_startable = FALSE
 
 /datum/vote/shuttle_call/can_be_initiated(mob/by_who, forced = FALSE)
 	. = ..()
 	if(!.)
 		return FALSE
-
-	if(!SSticker.HasRoundStarted() || SSautotransfer.called)
+	if(EMERGENCY_ESCAPED_OR_ENDGAMED)
+		return FALSE
+	if(!SSticker.HasRoundStarted() || SSautotransfer.called || SSshuttle.emergency.mode == SHUTTLE_CALL)
 		return FALSE
 	if(length(GLOB.player_list) < 25)
 		return FALSE
@@ -44,9 +49,16 @@ SUBSYSTEM_DEF(autotransfer)
 
 	message = initial(message)
 
-/datum/vote/shuttle_call/New()
+/datum/vote/shuttle_call/create_vote(mob/vote_creator)
 	. = ..()
-	default_choices = list("Yes", "No")
+	if(!.)
+		return FALSE
+	if(EMERGENCY_ESCAPED_OR_ENDGAMED)
+		return FALSE
+	if(!SSticker.HasRoundStarted() || SSautotransfer.called || SSshuttle.emergency.mode == SHUTTLE_CALL)
+		return FALSE
+	if(length(GLOB.player_list) < 25)
+		return FALSE
 
 
 /datum/vote/shuttle_call/finalize_vote(winning_option)