Merge pull request #9578 from deathride58/mapsubsystemimprovements

Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
This commit is contained in:
kevinz000
2019-10-29 21:42:32 -07:00
committed by GitHub
100 changed files with 251 additions and 90 deletions
+1 -4
View File
@@ -1025,7 +1025,7 @@
/obj/mecha/log_message(message as text, message_type=LOG_GAME, color=null, log_globally)
log.len++
log[log.len] = list("time"="[STATION_TIME_TIMESTAMP("hh:mm:ss")]","date","year"="[GLOB.year_integer+540]","message"="[color?"<font color='[color]'>":null][message][color?"</font>":null]")
log[log.len] = list("time"="[STATION_TIME_TIMESTAMP("hh:mm:ss")]","date","year"="[GLOB.year_integer]","message"="[color?"<font color='[color]'>":null][message][color?"</font>":null]")
..()
return log.len
@@ -1034,9 +1034,6 @@
last_entry["message"] += "<br>[red?"<font color='red'>":null][message][red?"</font>":null]"
return
GLOBAL_VAR_INIT(year, time2text(world.realtime,"YYYY"))
GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
///////////////////////
///// Power stuff /////
///////////////////////