Merge pull request #14711 from Shadowlight213/Playerooccolorfix

Fixes the Reset player OOC color verb not working
This commit is contained in:
duncathan salt
2016-01-19 07:29:23 -06:00
2 changed files with 6 additions and 3 deletions

View File

@@ -324,3 +324,6 @@ var/list/bloody_footprints_cache = list()
//Bloodcrawling
#define BLOODCRAWL 1
#define BLOODCRAWL_EAT 2
//Color Defines
#define OOC_COLOR "#002eb8"

View File

@@ -46,7 +46,7 @@
if((copytext(msg, 1, 2) in list(".",";",":","#")) || (findtext(lowertext(copytext(msg, 1, 5)), "say")))
if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes")
return
log_ooc("[mob.name]/[key] : [raw_msg]")
var/keyname = key
@@ -77,7 +77,7 @@
ooc_allowed = !ooc_allowed
world << "<B>The OOC channel has been globally [ooc_allowed ? "enabled" : "disabled"].</B>"
var/global/normal_ooc_colour = "#002eb8"
var/global/normal_ooc_colour = OOC_COLOR
/client/proc/set_ooc(newColor as color)
set name = "Set Player OOC Color"
@@ -89,7 +89,7 @@ var/global/normal_ooc_colour = "#002eb8"
set name = "Reset Player OOC Color"
set desc = "Returns player OOC Color to default"
set category = "Fun"
normal_ooc_colour = initial(normal_ooc_colour)
normal_ooc_colour = OOC_COLOR
/client/verb/colorooc()
set name = "Set Your OOC Color"