mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 21:19:44 +01:00
jobs, access and radio to defines (#18297)
* jobs, access and radio to defines * . * . * urg * . * . * finish the radio freqs * why * . * . * ticker initial * eh --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
1cb38c22ec
commit
e956d13a6b
@@ -181,7 +181,7 @@ SUBSYSTEM_DEF(radio)
|
||||
var/list/data = list()
|
||||
var/encryption
|
||||
|
||||
var/frequency = 0
|
||||
var/frequency = ZERO_FREQ
|
||||
|
||||
/datum/signal/proc/copy_from(datum/signal/model)
|
||||
source = model.source
|
||||
|
||||
@@ -90,7 +90,7 @@ SUBSYSTEM_DEF(job)
|
||||
return type_occupations[jobtype]
|
||||
|
||||
// Determines if a job title is inside of a specific department.
|
||||
// Useful to replace the old `if(job_title in command_positions)` code.
|
||||
// Useful to replace the old `if(job_title in GLOB.command_positions)` code.
|
||||
/datum/controller/subsystem/job/proc/is_job_in_department(rank, target_department_name)
|
||||
var/datum/department/D = LAZYACCESS(department_datums, target_department_name)
|
||||
if(istype(D))
|
||||
|
||||
@@ -93,11 +93,11 @@ SUBSYSTEM_DEF(ticker)
|
||||
/datum/controller/subsystem/ticker/fire(resumed = FALSE)
|
||||
switch(current_state)
|
||||
if(GAME_STATE_STARTUP)
|
||||
if(Master.initializations_finished_with_no_players_logged_in)
|
||||
start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
|
||||
// if(Master.initializations_finished_with_no_players_logged_in) // We want to wait the full time after the startup finished
|
||||
start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
|
||||
for(var/client/C in GLOB.clients)
|
||||
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
|
||||
to_chat(world, span_notice("<b>Welcome to [station_name()]!</b>"))
|
||||
to_chat(world, span_boldnotice("Welcome to [station_name()]!"))
|
||||
//for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
|
||||
// send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.current_map.map_name]!"), channel_tag)
|
||||
current_state = GAME_STATE_PREGAME
|
||||
@@ -108,6 +108,7 @@ SUBSYSTEM_DEF(ticker)
|
||||
//lobby stats for statpanels
|
||||
if(isnull(timeLeft))
|
||||
timeLeft = max(0,start_at - world.time)
|
||||
to_chat(world, span_notice("Round starting in [round(timeLeft / 10)] Seonds!"))
|
||||
totalPlayers = LAZYLEN(GLOB.new_player_list)
|
||||
totalPlayersReady = 0
|
||||
total_admins_ready = 0
|
||||
|
||||
Reference in New Issue
Block a user