this is making me so fucking agitated

Monkestation · Dec 2, 2023 · 16296dd · 16296dd
1 parent 5146015
commit 16296dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/code/controllers/subsystem/vote.dm b/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

diff --git a/code/datums/votes/_vote_datum.dm b/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))

diff --git a/monkestation/code/modules/goonimizations/shuttle_votes.dm b/monkestation/code/modules/goonimizations/shuttle_votes.dm
@@ -28,6 +28,8 @@ SUBSYSTEM_DEF(autotransfer)
 /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)
 	. = ..()
@@ -58,10 +60,6 @@ SUBSYSTEM_DEF(autotransfer)
 	if(length(GLOB.player_list) < 25)
 		return FALSE
 
-/datum/vote/shuttle_call/New()
-	. = ..()
-	default_choices = list("Yes", "No")
-
 
 /datum/vote/shuttle_call/finalize_vote(winning_option)
 	if(SSautotransfer.called)