mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Sound updates (#7430)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Selis <selis@xynolabs.com>
This commit is contained in:
@@ -244,7 +244,7 @@ var/list/gamemode_cache = list()
|
||||
|
||||
var/persistence_disabled = FALSE
|
||||
var/persistence_ignore_mapload = FALSE
|
||||
|
||||
|
||||
var/allow_byond_links = 1 //CHOMP Edit turned this on
|
||||
var/allow_discord_links = 1 //CHOMP Edit turned this on
|
||||
var/allow_url_links = 1 // honestly if I were you i'd leave this one off, only use in dire situations //CHOMP Edit: pussy.
|
||||
@@ -295,15 +295,17 @@ var/list/gamemode_cache = list()
|
||||
|
||||
var/static/vgs_access_identifier = null // VOREStation Edit - VGS
|
||||
var/static/vgs_server_port = null // VOREStation Edit - VGS
|
||||
|
||||
|
||||
var/disable_webhook_embeds = FALSE
|
||||
|
||||
|
||||
|
||||
|
||||
var/static/list/jukebox_track_files
|
||||
|
||||
|
||||
var/static/suggested_byond_version
|
||||
var/static/suggested_byond_build
|
||||
|
||||
var/static/invoke_youtubedl = null
|
||||
|
||||
/datum/configuration/New()
|
||||
var/list/L = subtypesof(/datum/game_mode)
|
||||
for (var/T in L)
|
||||
@@ -554,7 +556,7 @@ var/list/gamemode_cache = list()
|
||||
|
||||
if ("githuburl")
|
||||
config.githuburl = value
|
||||
|
||||
|
||||
if ("discordurl")
|
||||
config.discordurl = value
|
||||
|
||||
@@ -965,7 +967,7 @@ var/list/gamemode_cache = list()
|
||||
|
||||
if("enable_night_shifts")
|
||||
config.enable_night_shifts = TRUE
|
||||
|
||||
|
||||
if("jukebox_track_files")
|
||||
config.jukebox_track_files = splittext(value, ";")
|
||||
|
||||
@@ -982,6 +984,9 @@ var/list/gamemode_cache = list()
|
||||
config.vgs_server_port = text2num(value)
|
||||
// VOREStation Edit End
|
||||
|
||||
if("invoke_youtubedl")
|
||||
config.invoke_youtubedl = value
|
||||
|
||||
else
|
||||
log_misc("Unknown setting in configuration: '[name]'")
|
||||
|
||||
@@ -1047,7 +1052,7 @@ var/list/gamemode_cache = list()
|
||||
|
||||
if("use_loyalty_implants")
|
||||
config.use_loyalty_implants = 1
|
||||
|
||||
|
||||
if("loadout_whitelist")
|
||||
config.loadout_whitelist = text2num(value)
|
||||
|
||||
|
||||
@@ -512,6 +512,26 @@ SUBSYSTEM_DEF(timer)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/**
|
||||
* Get the remaining deciseconds on a timer
|
||||
*
|
||||
* Arguments:
|
||||
* * id a timerid or a /datum/timedevent
|
||||
*/
|
||||
/proc/timeleft(id, datum/controller/subsystem/timer/timer_subsystem)
|
||||
if (!id)
|
||||
return null
|
||||
if (id == TIMER_ID_NULL)
|
||||
CRASH("Tried to get timeleft of a null timerid. Use TIMER_STOPPABLE flag")
|
||||
if (istype(id, /datum/timedevent))
|
||||
var/datum/timedevent/timer = id
|
||||
return timer.timeToRun - world.time
|
||||
timer_subsystem = timer_subsystem || SStimer
|
||||
//id is string
|
||||
var/datum/timedevent/timer = timer_subsystem.timer_id_dict[id]
|
||||
if(!timer || timer.spent)
|
||||
return null
|
||||
return timer.timeToRun - (timer.flags & TIMER_CLIENT_TIME ? REALTIMEOFDAY : world.time)
|
||||
|
||||
#undef BUCKET_LEN
|
||||
#undef BUCKET_POS
|
||||
|
||||
Reference in New Issue
Block a user