diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 863f6a4308..67e4a97894 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -394,8 +394,6 @@ /datum/config_entry/flag/allow_random_events // Enables random events mid-round when set -/datum/config_entry/flag/admin_disk_inactive_msg //Allows admins to globally disable ingame logs for this crap - /datum/config_entry/number/events_min_time_mul // Multipliers for random events minimal starting time and minimal players amounts config_entry_value = 1 min_val = 0 diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index eef88e2117..80d05c9db4 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -335,6 +335,8 @@ SUBSYSTEM_DEF(ticker) var/list/adm = get_admin_counts() var/list/allmins = adm["present"] send2irc("Server", "Round [GLOB.round_id ? "#[GLOB.round_id]:" : "of"] [hide_mode ? "secret":"[mode.name]"] has started[allmins.len ? ".":" with no active admins online!"]") + if(CONFIG_GET(string/new_round_ping)) + send2chat("<@[CONFIG_GET(string/new_round_ping)]> | A new round has started on [SSmapping.config.map_name]!", CONFIG_GET(string/chat_announce_new_game)) setup_done = TRUE for(var/i in GLOB.start_landmarks_list) @@ -399,7 +401,7 @@ SUBSYSTEM_DEF(ticker) //skyrat change if(ishuman(N.new_character)) SSlanguage.AssignLanguage(N.new_character, N.client) - // + // N.client.prefs.post_copy_to(player) CHECK_TICK if(captainless) diff --git a/config/config.txt b/config/config.txt index 68128bb779..8c7eee42a7 100644 --- a/config/config.txt +++ b/config/config.txt @@ -12,7 +12,7 @@ $include plushies/defines.txt $include job_threats.txt $include policy.txt # Special Sandstorm configs -$include sand/config.txt +$include sandstorm/config.txt # You can use the @ character at the beginning of a config option to lock it from being edited in-game # Example usage: diff --git a/config/sand/config.txt b/config/sandstorm/config.txt similarity index 57% rename from config/sand/config.txt rename to config/sandstorm/config.txt index 3a3e5ac6ac..401708103b 100644 --- a/config/sand/config.txt +++ b/config/sandstorm/config.txt @@ -2,4 +2,8 @@ ## Lone op inactive disk messaging ## Comment this out to disable that spam that annoys me. -ADMIN_DISK_INACTIVE_MSG +#ADMIN_DISK_INACTIVE_MSG + +## Roundstart ping +## Won't do anything if unset +#NEW_ROUND_PING diff --git a/sandcode/code/controllers/configuration/entries/sandstorm.dm b/sandcode/code/controllers/configuration/entries/sandstorm.dm new file mode 100644 index 0000000000..a0519addc2 --- /dev/null +++ b/sandcode/code/controllers/configuration/entries/sandstorm.dm @@ -0,0 +1,4 @@ +/datum/config_entry/flag/admin_disk_inactive_msg //Allows admins to globally disable ingame logs for this crap + +/datum/config_entry/string/new_round_ping + config_entry_value = null diff --git a/tgstation.dme b/tgstation.dme index 12490acab3..a0ccbd6641 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3650,6 +3650,7 @@ #include "sandcode\code\_globalvars\lists\misc.dm" #include "sandcode\code\_globalvars\lists\objects.dm" #include "sandcode\code\_onclick\hud\screen_objects.dm" +#include "sandcode\code\controllers\configuration\entries\sandstorm.dm" #include "sandcode\code\datums\action.dm" #include "sandcode\code\datums\ai_laws.dm" #include "sandcode\code\datums\shuttles.dm"