Skip to content

Commit bbce19f

Browse files
committed
just to be sure nothing goes wrong
:D
1 parent e097923 commit bbce19f

4 files changed

Lines changed: 13 additions & 3 deletions

File tree

code/controllers/subsystem/ticker.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ SUBSYSTEM_DEF(ticker)
200200
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_SETTING_UP)
201201
current_state = GAME_STATE_SETTING_UP
202202
Master.SetRunLevel(RUNLEVEL_SETUP)
203+
//MASSMETA EDIT ADDITION START (BOT_TOPICS) (BlackCrystalic)
203204
timeLeft = 0
205+
//MASSMETA EDIT ADDITION END (BOT_TOPICS) (BlackCrystalic)
204206
if(start_immediately)
205207
fire()
206208

code/datums/world_topic.dm

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,10 @@
437437
data["hub"] = GLOB.hub_visibility
438438

439439
data["security_level"] = SSsecurity_level.get_current_level_as_text()
440+
//MASSMETA EDIT ADDITION START (BOT_TOPICS) (BlackCrystalic)
441+
//ORIGINAL: data["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
440442
data["round_duration"] = world.time/10
443+
//MASSMETA EDIT ADDITION END (BOT_TOPICS) (BlackCrystalic)
441444

442445
//Time dilation stats.
443446
data["time_dilation_current"] = SStime_track.time_dilation_current
@@ -520,9 +523,12 @@ GLOBAL_LIST_EMPTY(bot_asay_sending_que)
520523
var/msg = sanitize(data["message"])
521524
for(var/client/C in GLOB.clients)
522525
if(C.prefs.chat_toggles & CHAT_OOC)
526+
//MASSMETA EDIT ADDITION START (BOT_TOPICS) (BlackCrystalic)
523527
to_chat(C, span_ooc("<font color='[GLOB.OOC_COLOR]'><b>[span_prefix("DISCORD OOC:")] <EM>[data["author"]]:</EM> <span class='message linkify'>[msg]</span></b></font>"))
524-
528+
//MASSMETA EDIT ADDITION END (BOT_TOPICS) (BlackCrystalic)
525529
if(bot_data["admin"])
530+
//MASSMETA EDIT START (BOT_TOPICS) (BlackCrystalic)
531+
// ORIGINAL: to_chat(GLOB.admins, "<span class='adminsay'><span class='prefix'>DISCORD ADMIN:</span> <EM>[data["author"]]</EM>: <span class='message linkify'>[sanitize(data["message"])]</span></span>", confidential = TRUE)
526532
for(var/list/data in bot_data["admin"])
527533
to_chat(GLOB.admins, span_adminsay("[span_prefix("DISCORD ADMIN:")] <EM>[data["author"]]</EM>: <span class='message linkify'>[sanitize(data["message"])]</span>"))
528534

code/modules/client/verbs/ooc.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
7676
return
7777

7878
mob.log_talk(raw_msg, LOG_OOC)
79+
//MASSMETA EDIT ADDITION START (BOT_TOPICS) (BlackCrystalic)
7980
GLOB.bot_ooc_sending_que += list(list("author" = holder?.fakekey ? holder.fakekey : key, "message" = msg))
80-
81+
//MASSMETA EDIT ADDITION END (BOT_TOPICS) (BlackCrystalic)
8182
var/keyname = key
8283
if(prefs.unlock_content)
8384
if(prefs.toggles & MEMBER_PUBLIC)

modular_meta/main_modular_include.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
/* --- Reverts --- */
4646

4747
#include "reverts\beheading\includes.dm"
48-
#include "reverts\buff_lasers\includes.dm"
48+
//We've decided this module has been proven unneccessary.
49+
//#include "reverts\buff_lasers\includes.dm"
4950
#include "reverts\bulky_extinguishers\includes.dm"
5051
#include "reverts\colossus\includes.dm"
5152
#include "reverts\glasses_protect\includes.dm"

0 commit comments

Comments
 (0)