diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm index 0866addff58..41216634ebe 100644 --- a/code/datums/Emote_system/emote.dm +++ b/code/datums/Emote_system/emote.dm @@ -428,13 +428,16 @@ VampyrBytes //Emote Cooldown System (it's so simple!) /datum/emote/proc/handle_emote_CD(var/mob/user) - if(user.emote_cd == 2) return 1 // Cooldown emotes were disabled by an admin, prevent use - if(user.emote_cd == 1) return 1 // Already on CD, prevent use + if(user.emote_cd == 2) // Cooldown emotes were disabled by an admin, prevent use + return 1 + if(user.emote_cd == 1) // Already on CD, prevent use + return 1 user.emote_cd = 1 // Starting cooldown spawn(cooldown) - if(user.emote_cd == 2) return 1 // Don't reset if cooldown emotes were disabled by an admin during the cooldown + if(!user || user.emote_cd == 2) // Don't reset if cooldown emotes were disabled by an admin during the cooldown + return 1 user.emote_cd = 0 // Cooldown complete, ready for more! return 0 // Proceed with emote diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 2483f6ed163..e21078c7ad9 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -116,6 +116,9 @@ var/const/access_trade_sol = 160 if(check_access()) return 1 + if(!M) + return 0 + var/acc = M.get_access() //see mob.dm if(acc == IGNORE_ACCESS) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 48bb773c453..302f6a1f742 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -63,7 +63,8 @@ var/global/admin_ooc_colour = "#b82e00" var/display_name = src.key if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) - display_name = "[display_name]" + var/icon/byond = icon('icons/member_content.dmi', "blag") + display_name = "[bicon(byond)][display_name]" if(holder) if(holder.fakekey) if(C.holder) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 6abd4acd6fc..bc8182f4049 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -354,7 +354,7 @@ speech_verb = "growls" ask_verb = "gnarls" exclaim_verb = "snarls" - colour = "rough" + colour = "gutter" key = "3" syllables = list ("gra","ba","ba","breh","bra","rah","dur","ra","ro","gro","go","ber","bar","geh","heh", "gra") diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 51530c0ba1f..39e684f0843 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -329,7 +329,7 @@ h1.alert, h2.alert {color: #000000;} .red {color: #FF0000;} .grey {font-family: "Wingdings", cursive, sans-serif;} .skeleton {color: #585858; font-weight: bold; font-style: italic;} -.gutter {color: #61380B; font-style: italic;} +.gutter {color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;} .orange {color: #ffa500;} .orangei {color: #ffa500; font-style: italic;} .orangeb {color: #ffa500; font-weight: bold;} diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index 67d9507187a..39fd96a722e 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -131,7 +131,7 @@ var/list/chatResources = list( var/list/found = new() for(var/i = connectionHistory.len; i >= 1; i--) var/list/row = connectionHistory[i] - if(!row || row.len < 3 || (!row["ckey"] && !row["compid"] && !row["ip"])) + if(!row || row.len < 3 || !(row["ckey"] && row["compid"] && row["ip"])) return if(world.IsBanned(row["ckey"], row["compid"], row["ip"])) found = row