Merge pull request #3520 from eswordthecat/remove-global

Move default OOC color var to configuration.
This commit is contained in:
d3athrow
2015-03-24 16:56:51 -05:00
2 changed files with 6 additions and 5 deletions

View File

@@ -161,6 +161,8 @@
var/map_voting = 0
var/default_ooc_color = "#002eb8"
/datum/configuration/New()
. = ..()
var/list/L = typesof(/datum/game_mode) - /datum/game_mode

View File

@@ -1,5 +1,3 @@
var/global/normal_ooc_colour = "#002eb8"
/client/verb/ooc(msg as text)
set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
set category = "OOC"
@@ -40,7 +38,7 @@ var/global/normal_ooc_colour = "#002eb8"
log_ooc("[mob.name]/[key] (@[mob.x],[mob.y],[mob.z]): [msg]")
var/display_colour = normal_ooc_colour
var/display_colour = config.default_ooc_color
if(holder && !holder.fakekey)
display_colour = "#0099cc" //light blue
if(holder.rights & R_MOD && !(holder.rights & R_ADMIN))
@@ -83,7 +81,8 @@ var/global/normal_ooc_colour = "#002eb8"
set name = "Set Player OOC Colour"
set desc = "Set to yellow for eye burning goodness."
set category = "Fun"
normal_ooc_colour = newColor
config.default_ooc_color = newColor
// Stealing it back :3c -Nexypoo
/client/verb/looc(msg as text)