From 069413db0d4188076a1b0bd6c9dfe08b49a40386 Mon Sep 17 00:00:00 2001 From: Hazelrat Date: Sat, 26 Oct 2024 15:48:39 +0100 Subject: [PATCH] Initial --- code/controllers/subsystems/ticker.dm | 7 ++- .../changelogs/hazelmouse-ghostrolethingy.yml | 58 +++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/hazelmouse-ghostrolethingy.yml diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 7b255ae4e43..c658743fd2f 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -143,6 +143,7 @@ var/datum/controller/subsystem/ticker/SSticker total_players = length(GLOB.player_list) if (current_state == GAME_STATE_PREGAME && pregame_timeleft == GLOB.config.vote_autogamemode_timeleft) + welcome() SSvote.autogamemode() pregame_timeleft-- return @@ -453,6 +454,10 @@ var/datum/controller/subsystem/ticker/SSticker setup_player_ready_list() + callHook("pregame_start") + +/// Handles welcome message and prints out ghostrole information. Should be called after offsites have spawned. +/datum/controller/subsystem/ticker/proc/welcome() to_world("Welcome to the pre-game lobby!") to_world("Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds.") @@ -489,8 +494,6 @@ var/datum/controller/subsystem/ticker/SSticker "} to_world(html) - callHook("pregame_start") - /datum/controller/subsystem/ticker/proc/setup() //Create and announce mode if(GLOB.master_mode == ROUNDTYPE_STR_SECRET) diff --git a/html/changelogs/hazelmouse-ghostrolethingy.yml b/html/changelogs/hazelmouse-ghostrolethingy.yml new file mode 100644 index 00000000000..b5221d7ad97 --- /dev/null +++ b/html/changelogs/hazelmouse-ghostrolethingy.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Available ghostroles now appear correctly at roundstart."