Merge pull request #701 from lmenvs/remove-player-vote

Removes ability for players to initiate vote on  storytellers

code/controllers/subsystem/vote.dm

@@ -206,9 +206,7 @@ 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

@@ -80,8 +80,10 @@
  */
 /datum/vote/proc/can_be_initiated(mob/by_who, forced = FALSE)
 	SHOULD_CALL_PARENT(TRUE)
-	if(!player_startable)
+	//monkestation edit begin
+	if(!player_startable && !forced)
 		return FALSE
+	//monkestation edit end
 
 	if(started_time)
 		var/next_allowed_time = (started_time + CONFIG_GET(number/vote_delay))

monkestation/code/modules/storytellers/storytellers/vote.dm

@@ -7,6 +7,7 @@
 	name = "Storyteller"
 	message = "Vote for the storyteller!"
 	has_desc = TRUE
+	player_startable = FALSE
 
 
 /datum/vote/storyteller/New()