cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Spans to procs (#9495)

Browse Source
This commit is contained in:
Tom
2021-11-16 23:29:43 +00:00
committed by GitHub
parent bca78f3cf9
commit 21f894e9b8
183 changed files with 1004 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/admin/code/adminhelp.dm
+2 -2
View File
@@ -20,9 +20,9 @@
last_AH = pop(prev_tickets)
last_AH.PlayerTicketPanel()
return
// client had no tickets this round
to_chat(src, "<span class='warning'>You have not had an ahelp ticket this round.</span>")
to_chat(src, span_warning("You have not had an ahelp ticket this round."))
return
current_ticket.PlayerTicketPanel()
modular_skyrat/modules/admin/code/aooc.dm
+8 -8
View File
@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name)
set category = "OOC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
to_chat(usr, span_danger("Speech is currently admin-disabled."))
return
if(!mob)
@@ -18,16 +18,16 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name)
if(!holder)
if(!mob.mind || !length(mob.mind.antag_datums))
to_chat(src, "<span class='danger'>You're not an antagonist!</span>")
to_chat(src, span_danger("You're not an antagonist!"))
return
if(!GLOB.aooc_allowed)
to_chat(src, "<span class='danger'>AOOC is globally muted.</span>")
to_chat(src, span_danger("AOOC is globally muted."))
return
if(prefs.muted & MUTE_OOC)
to_chat(src, "<span class='danger'>You cannot use OOC (muted).</span>")
to_chat(src, span_danger("You cannot use OOC (muted)."))
return
if(is_banned_from(ckey, "OOC"))
to_chat(src, "<span class='danger'>You have been banned from OOC.</span>")
to_chat(src, span_danger("You have been banned from OOC."))
return
if(QDELETED(src))
return
@@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name)
msg = emoji_parse(msg)
if(!(prefs.chat_toggles & CHAT_OOC))
to_chat(src, "<span class='danger'>You have OOC muted.</span>")
to_chat(src, span_danger("You have OOC muted."))
return
mob.log_talk(raw_msg, LOG_OOC, tag="AOOC")
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name)
var/mode = listeners[c]
var/color = (!anon && CONFIG_GET(flag/allow_admin_ooccolor) && C.prefs?.read_preference(/datum/preference/color/ooc_color)) ? C.prefs?.read_preference(/datum/preference/color/ooc_color) : GLOB.AOOC_COLOR
var/name = (mode == AOOC_LISTEN_ADMIN && anon) ? "([key])[keyname]" : keyname
to_chat(C, "<span class='oocplain'><font color='[color]'><b><span class='prefix'>AOOC:</span> <EM>[name]:</EM> <span class='message linkify'>[msg]</span></b></font></span>")
to_chat(C, span_oocplain("<font color='[color]'><b><span class='prefix'>AOOC:</span> <EM>[name]:</EM> <span class='message linkify'>[msg]</span></b></font>"))
#undef AOOC_LISTEN_PLAYER
#undef AOOC_LISTEN_ADMIN
@@ -101,7 +101,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name)
listeners[M.client] = TRUE
for(var/c in listeners)
var/client/C = c
to_chat(C, "<span class='oocplain'><B>The AOOC channel has been globally [GLOB.aooc_allowed ? "enabled" : "disabled"].</B></span>")
to_chat(C, span_oocplain("<B>The AOOC channel has been globally [GLOB.aooc_allowed ? "enabled" : "disabled"].</B>"))
/datum/admins/proc/toggleaooc()
set category = "Server"
modular_skyrat/modules/admin/code/loud_say.dm
+1 -1
View File
@@ -14,7 +14,7 @@
msg = keywords_lookup(msg)
var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && prefs?.read_preference(/datum/preference/color/asay_color)) ? "<font color=[prefs?.read_preference(/datum/preference/color/asay_color)]>" : "<font color='#FF4500'>"
msg = "<span class='command_headset'> <span class='adminsay'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]</EM> [ADMIN_FLW(mob)]: [custom_asay_color]<span class='message linkify'>[msg]</span></span></span>[custom_asay_color ? "</font>":null]"
msg = span_command_headset("<span class='adminsay'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]</EM> [ADMIN_FLW(mob)]: [custom_asay_color]<span class='message linkify'>[msg]</span></span></span>[custom_asay_color ? "</font>":null]")
to_chat(GLOB.admins,
type = MESSAGE_TYPE_ADMINCHAT,
html = msg,
modular_skyrat/modules/admin/code/sooc.dm
+8 -8
View File
@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
set category = "OOC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
to_chat(usr, span_danger("Speech is currently admin-disabled."))
return
if(!mob)
@@ -20,16 +20,16 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
if(!holder)
var/job = mob?.mind.assigned_role.title
if(!job || !job_lookup[job])
to_chat(src, "<span class='danger'>You're not a security role!</span>")
to_chat(src, span_danger("You're not a security role!"))
return
if(!GLOB.sooc_allowed)
to_chat(src, "<span class='danger'>SOOC is globally muted.</span>")
to_chat(src, span_danger("SOOC is globally muted."))
return
if(prefs.muted & MUTE_OOC)
to_chat(src, "<span class='danger'>You cannot use OOC (muted).</span>")
to_chat(src, span_danger("You cannot use OOC (muted)."))
return
if(is_banned_from(ckey, "OOC"))
to_chat(src, "<span class='danger'>You have been banned from OOC.</span>")
to_chat(src, span_danger("You have been banned from OOC."))
return
if(QDELETED(src))
return
@@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
msg = emoji_parse(msg)
if(!(prefs.chat_toggles & CHAT_OOC))
to_chat(src, "<span class='danger'>You have OOC muted.</span>")
to_chat(src, span_danger("You have OOC muted."))
return
mob.log_talk(raw_msg, LOG_OOC, tag="SOOC")
@@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
var/mode = listeners[c]
var/color = (!anon && CONFIG_GET(flag/allow_admin_ooccolor) && C.prefs?.read_preference(/datum/preference/color/ooc_color)) ? C.prefs?.read_preference(/datum/preference/color/ooc_color) : GLOB.SOOC_COLOR
var/name = (mode == SOOC_LISTEN_ADMIN && anon) ? "([key])[keyname]" : keyname
to_chat(C, "<span class='oocplain'><font color='[color]'><b><span class='prefix'>SOOC:</span> <EM>[name]:</EM> <span class='message linkify'>[msg]</span></b></font></span>")
to_chat(C, span_oocplain("<font color='[color]'><b><span class='prefix'>SOOC:</span> <EM>[name]:</EM> <span class='message linkify'>[msg]</span></b></font>"))
#undef SOOC_LISTEN_PLAYER
#undef SOOC_LISTEN_ADMIN
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
listeners[M.client] = TRUE
for(var/c in listeners)
var/client/C = c
to_chat(C, "<span class='oocplain'><B>The SOOC channel has been globally [GLOB.sooc_allowed ? "enabled" : "disabled"].</B></span>")
to_chat(C, span_oocplain("<B>The SOOC channel has been globally [GLOB.sooc_allowed ? "enabled" : "disabled"].</B>"))
/datum/admins/proc/togglesooc()
set category = "Server"