diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 3fe441f5..2c080492 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -63,13 +63,13 @@ var/global/normal_ooc_colour = "#002eb8" var/display_colour = normal_ooc_colour if(holder && !holder.fakekey) - display_colour = "#0099cc" //light blue +// display_colour = "#0099cc" //light blue //We decided they didn't need to be known if(holder.rights & R_MOD && !(holder.rights & R_ADMIN)) display_colour = "#1b521f" //dark green - if(holder.rights & R_DEBUG && !(holder.rights & R_ADMIN)) - display_colour = "#184880" //dark blue if(holder.rights & R_DEV && !(holder.rights & R_ADMIN)) display_colour = "#184880" //dark blue + if(holder.rights & R_DEBUG && !(holder.rights & R_ADMIN)) //This is actually a higher rank + display_colour = "#0099cc" //light blue else if(holder.rights & R_ADMIN) if(config.allow_admin_ooccolor) display_colour = src.prefs.ooccolor @@ -81,7 +81,7 @@ var/global/normal_ooc_colour = "#002eb8" var/display_name = src.key if(holder) if(holder.fakekey) - if(C.holder & (holder.rights & (R_ADMIN|R_MOD))) + if(C.holder && C.holder.rights & (R_ADMIN|R_MOD)) display_name = "[holder.fakekey]/([src.key])" else display_name = holder.fakekey @@ -197,10 +197,9 @@ var/global/normal_ooc_colour = "#002eb8" display_name = holder.fakekey C << "LOOC: [display_name]: [msg]" for(var/client/C in admins) - if(!C.holder.rights & (R_ADMIN|R_MOD|R_DEV)) - continue - if(C.prefs.toggles & CHAT_LOOC) - var/prefix = "(R)LOOC" - if (C.mob in heard) - prefix = "LOOC" - C << "[prefix]: [src.key]: [msg]" \ No newline at end of file + if(C.holder.rights & (R_ADMIN|R_MOD|R_DEV)) + if(C.prefs.toggles & CHAT_LOOC) + var/prefix = "(R)LOOC" + if (C.mob in heard) + prefix = "LOOC" + C << "[prefix]: [src.key]: [msg]" \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index ce9c73fe..462984fb 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -148,4 +148,8 @@ response_harm = "splats" /mob/living/simple_animal/mouse/can_use_vents() - return \ No newline at end of file + return + +/mob/living/simple_animal/mouse/ghost() + client.time_died_as_mouse = world.time + ..() \ No newline at end of file diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 68719f5a..130b4bee 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -20,7 +20,7 @@ em {font-style: normal; font-weight: bold;} .adminobserver {color: #996600; font-weight: bold;} .admin {color: #386aff; font-weight: bold;} .adminsay {color: #9611D4; font-weight: bold;} -.dutysay {color: #C19A3B;} +.dutysay {color: #380B61;} .name { font-weight: bold;} .say {}