cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14711 from Shadowlight213/Playerooccolorfix

Browse Source 
Fixes the Reset player OOC color verb not working
This commit is contained in:
duncathan salt
2016-01-19 07:29:23 -06:00
parent 1b2ec539af 92103ac3f4
commit ae2b35124e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__DEFINES/misc.dm
View File

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

6
code/game/verbs/ooc.dm
View File

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