From bec4591556c94610b622e8c34b0dea10f6b59c75 Mon Sep 17 00:00:00 2001
From: DigitalSquirrel95 <48812209+DigitalSquirrel95@users.noreply.github.com>
Date: Fri, 11 Oct 2019 01:43:00 -0400
Subject: [PATCH 1/2] Changes the crew transfer message to be more IC friendly.
A simple change that changes the crew transfer vote message to something that implies the crew is voting for extra work on their PDAs. This makes the crew transfer make a bit more sense in character, because as it stands, our characters are currently coming to work not really knowing when they get off work.
Direct port of this: https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/572
---
code/controllers/subsystems/vote.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm
index e7c3d5aaf9b..7550ce16527 100644
--- a/code/controllers/subsystems/vote.dm
+++ b/code/controllers/subsystems/vote.dm
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(vote)
factor = 1.4
choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor)
world << "Crew Transfer Factor: [factor]"
- greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"])
+ greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //Citadel change
. = list() // Get all options with that many votes and return them in a list
if(greatest_votes)
@@ -220,8 +220,8 @@ SUBSYSTEM_DEF(vote)
if(ticker.current_state <= GAME_STATE_SETTING_UP)
initiator_key << "The crew transfer button has been disabled!"
return 0
- question = "End the shift?"
- choices.Add("Initiate Crew Transfer", "Continue The Round")
+ question = "Your PDA beeps with a message from Central. Would you like an additional hour to finish ongoing projects?" //Citadel change
+ choices.Add("Initiate Crew Transfer", "Extend the Shift") //Citadel change
if(VOTE_ADD_ANTAGONIST)
if(!config.allow_extra_antags || ticker.current_state >= GAME_STATE_SETTING_UP)
return 0
From 30f751b23f55826e49e701985319b134f8166f52 Mon Sep 17 00:00:00 2001
From: DigitalSquirrel95 <48812209+DigitalSquirrel95@users.noreply.github.com>
Date: Fri, 11 Oct 2019 02:29:58 -0400
Subject: [PATCH 2/2] Update vote.dm
---
code/controllers/subsystems/vote.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm
index 7550ce16527..54fb4879851 100644
--- a/code/controllers/subsystems/vote.dm
+++ b/code/controllers/subsystems/vote.dm
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(vote)
factor = 1.4
choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor)
world << "Crew Transfer Factor: [factor]"
- greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //Citadel change
+ greatest_votes = max(choices["Initiate Crew Transfer"], choices["Extend the Shift"]) //VOREStation Edit
. = list() // Get all options with that many votes and return them in a list
if(greatest_votes)
@@ -220,8 +220,8 @@ SUBSYSTEM_DEF(vote)
if(ticker.current_state <= GAME_STATE_SETTING_UP)
initiator_key << "The crew transfer button has been disabled!"
return 0
- question = "Your PDA beeps with a message from Central. Would you like an additional hour to finish ongoing projects?" //Citadel change
- choices.Add("Initiate Crew Transfer", "Extend the Shift") //Citadel change
+ question = "Your PDA beeps with a message from Central. Would you like an additional hour to finish ongoing projects?" //VOREStation Edit
+ choices.Add("Initiate Crew Transfer", "Extend the Shift") //VOREStation Edit
if(VOTE_ADD_ANTAGONIST)
if(!config.allow_extra_antags || ticker.current_state >= GAME_STATE_SETTING_UP)
return 0