Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions code/__HELPERS/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ var/command_name
return "Nyx"


/proc/get_default_world_name()
var/config_server_name = CONFIG_GET(string/servername)
if(config_server_name)
return "[config_server_name][config_server_name == GLOB.station_name ? "" : ": [html_decode(GLOB.station_name)]"]"
else
return html_decode(GLOB.station_name)

/proc/station_name()
if(!GLOB.station_name)
var/newname
Expand All @@ -29,11 +36,7 @@ var/command_name
/proc/set_station_name(new_name)
GLOB.station_name = new_name

var/config_server_name = CONFIG_GET(string/servername)
if(config_server_name)
world.name = "[config_server_name][config_server_name == GLOB.station_name ? "" : ": [html_decode(GLOB.station_name)]"]"
else
world.name = html_decode(GLOB.station_name)
world.name = get_default_world_name()

/proc/world_name(name)
GLOB.station_name = name
Expand Down
3 changes: 3 additions & 0 deletions code/controllers/master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ GLOBAL_REAL(Master, /datum/controller/master)

rustg_time_reset(SS_INIT_TIMER_KEY)
log_game("Initializing [subsystem.name] subsystem...")
world.name = "[get_default_world_name(FALSE)] - [subsystem.order_string()] Initializing [subsystem.name] subsystem..."
subsystem.Initialize()

CHECK_TICK
Expand All @@ -258,6 +259,8 @@ GLOBAL_REAL(Master, /datum/controller/master)
var/msg_fancy = "Initializations complete within [get_colored_thresh_text("[time] second[time == 1 ? "" : "s"]!", time, 200 SECONDS / 10)]!"
msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!"

world.name = get_default_world_name()

to_chat(world, span_boldannounce(msg_fancy))
log_world(msg)

Expand Down
5 changes: 4 additions & 1 deletion code/controllers/subsystem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,16 @@

var/time = rustg_time_milliseconds(SS_INIT_TIMER_KEY)
var/seconds = round(time / 1000, 0.01)
var/order_string = "S[init_stage]-[order_in_stage <= 9 ? "0" : ""][order_in_stage]/[Master.stage_sorted_subsystems[init_stage].len]"
var/order_string = order_string()
var/msg_fancy = "<code>\[[order_string]\]</code> Initialized [span_adminsay(name)] subsystem within [get_colored_thresh_text("[seconds] second[seconds == 1 ? "" : "s"]!", seconds, init_time_threshold / 10)]"
var/msg = "\[[order_string]\] Initialized [name] subsystem within [seconds] second[seconds == 1 ? "" : "s"]!"
to_chat(world, span_boldannounce(msg_fancy))
log_world(msg)
return seconds

/datum/controller/subsystem/proc/order_string(include_stage = TRUE)
return "[include_stage ? "S[init_stage]-" : ""][order_in_stage <= 9 ? "0" : ""][order_in_stage]/[Master.stage_sorted_subsystems[init_stage].len]"

/datum/controller/subsystem/stat_entry(msg)
if(can_fire && !(SS_NO_FIRE & flags) && init_stage <= Master.init_stage_completed)
msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)]\t[msg]"
Expand Down
1 change: 0 additions & 1 deletion interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@ window "mainwindow"
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
statusbar = false
title = "CEV Eris: Fullscreen Edition"
icon = 'icons\\ss13_64.png'
macro = "default"
menu = "menu"
Expand Down
Loading