cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 05:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #398 from SoundScopes/master

Browse Source 
Scopes Updates
This commit is contained in:
skull132
2015-02-25 21:22:25 +02:00
parent 15ce6832fd 293d728ff2
commit 6672368180
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/verbs/ooc.dm
+10 -11
View File
@@ -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 << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
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 << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"
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 << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"
code/modules/mob/living/simple_animal/friendly/mouse.dm
+5 -1
View File
@@ -148,4 +148,8 @@
response_harm = "splats"
/mob/living/simple_animal/mouse/can_use_vents()
return
return
/mob/living/simple_animal/mouse/ghost()
client.time_died_as_mouse = world.time
..()
code/stylesheet.dm
+1 -1
View File
@@ -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 {}