cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] jobs, access and radio to defines (#11546)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-31 03:56:12 +02:00
committed by GitHub
co-authored by Kashargul
parent b3ad80a7f9
commit 89704592dd
353 changed files with 1904 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/communications.dm
+1 -1
View File
@@ -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
code/controllers/subsystems/job.dm
+1 -1
View File
@@ -97,7 +97,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))
code/controllers/subsystems/ticker.dm
+6 -3
View File
@@ -93,11 +93,13 @@ 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
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)
@@ -106,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