cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes crew transfer votes not starting (#9157)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 15:26:57 -07:00
committed by GitHub
parent dd40869551
commit 18e8928f96
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/autotransfer.dm
View File

@@ -26,6 +26,6 @@ var/datum/controller/transfer_controller/transfer_controller
shift_hard_end = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur. // CHOMPEdit shift_hard_end = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur. // CHOMPEdit
timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //Just to make sure a vote doesn't occur immediately afterwords. // CHOMPEdit timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) //Just to make sure a vote doesn't occur immediately afterwords. // CHOMPEdit
else if (round_duration_in_ds >= timerbuffer - 1 MINUTE) else if (round_duration_in_ds >= timerbuffer - 1 MINUTE)
new /datum/vote/crew_transfer SSvote.start_vote(new /datum/vote/crew_transfer)
//VOREStation Edit END //VOREStation Edit END
timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) // CHOMPEdit timerbuffer = timerbuffer + CONFIG_GET(number/vote_autotransfer_interval) // CHOMPEdit

2
code/controllers/subsystems/ticker.dm
View File

@@ -229,7 +229,7 @@ var/global/datum/controller/subsystem/ticker/ticker
mode.cleanup() mode.cleanup()
//call a transfer shuttle vote //call a transfer shuttle vote
to_world(span_danger("The round has ended!")) to_world(span_danger("The round has ended!"))
new /datum/vote/crew_transfer SSvote.start_vote(new /datum/vote/crew_transfer)
to_world("<span class='danger'>The round has ended!</span>") to_world("<span class='danger'>The round has ended!</span>")
// Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME) // Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME)

4
code/modules/admin/admin_verb_lists_vr.dm
View File

@@ -129,6 +129,7 @@ var/list/admin_verbs_admin = list(
/client/proc/removetickets, /client/proc/removetickets,
/client/proc/delbook, /client/proc/delbook,
/client/proc/toggle_spawning_with_recolour, /client/proc/toggle_spawning_with_recolour,
/client/proc/start_vote,
/client/proc/reload_jobwhitelist, //ChompADD /client/proc/reload_jobwhitelist, //ChompADD
/client/proc/reload_alienwhitelist //ChompADD /client/proc/reload_alienwhitelist //ChompADD
) )
@@ -427,6 +428,7 @@ var/list/admin_verbs_mod = list(
/datum/admins/proc/view_persistent_data, /datum/admins/proc/view_persistent_data,
/datum/admins/proc/view_txt_log, //shows the server log (diary) for today, /datum/admins/proc/view_txt_log, //shows the server log (diary) for today,
/datum/admins/proc/view_atk_log, //shows the server combat-log, doesn't do anything presently, /datum/admins/proc/view_atk_log, //shows the server combat-log, doesn't do anything presently,
/client/proc/start_vote,
/datum/admins/proc/quick_nif, //CHOMPStation Add, /datum/admins/proc/quick_nif, //CHOMPStation Add,
/client/proc/reload_jobwhitelist, //ChompADD /client/proc/reload_jobwhitelist, //ChompADD
/client/proc/reload_alienwhitelist //ChompADD /client/proc/reload_alienwhitelist //ChompADD
@@ -573,11 +575,11 @@ var/list/admin_verbs_event_manager = list(
/client/proc/toggle_random_events, /client/proc/toggle_random_events,
/client/proc/modify_server_news, /client/proc/modify_server_news,
/client/proc/toggle_spawning_with_recolour, /client/proc/toggle_spawning_with_recolour,
/client/proc/start_vote,
/datum/admins/proc/quick_nif, //CHOMPStation Add, /datum/admins/proc/quick_nif, //CHOMPStation Add,
/datum/admins/proc/quick_authentic_nif, //CHOMPStation add /datum/admins/proc/quick_authentic_nif, //CHOMPStation add
/client/proc/reload_jobwhitelist, //ChompADD /client/proc/reload_jobwhitelist, //ChompADD
/client/proc/reload_alienwhitelist //ChompADD /client/proc/reload_alienwhitelist //ChompADD
) )
/client/proc/add_admin_verbs() /client/proc/add_admin_verbs()