cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sorts the majority of the rest of the Skyrat specific unsorted chat (#5378)

Browse Source 
* yay

* forgot to commit this

* Update tgui/packages/tgui-panel/chat/constants.js

Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
Seris02
2021-05-07 02:32:09 +01:00
committed by GitHub
co-authored by Gandalf
parent 0c9a08e777
commit 39ca7ad1fa
14 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/emotes.dm
+2 -2
View File
@@ -82,10 +82,10 @@
if(emote_type == EMOTE_AUDIBLE)
//SKYRAT EDIT CHANGE BEGIN
//user.audible_message(msg, audible_message_flags = EMOTE_MESSAGE) - SKYRAT EDIT - ORIGINAL
user.audible_message(msg, deaf_message = "You see how <b>[user]</b> [msg]", audible_message_flags = EMOTE_MESSAGE)
user.audible_message(msg, deaf_message = "<span class='emote'>You see how <b>[user]</b> [msg]</span>", audible_message_flags = EMOTE_MESSAGE)
else
//user.visible_message(msg, visible_message_flags = EMOTE_MESSAGE) - SKYRAT EDIT - ORIGINAL
user.visible_message(msg, blind_message = "You hear how <b>[user]</b> [msg]", visible_message_flags = EMOTE_MESSAGE)
user.visible_message(msg, blind_message = "<span class='emote'>You hear how <b>[user]</b> [msg]</span>", visible_message_flags = EMOTE_MESSAGE)
//SKYRAT EDIT CHANGE END
/// For handling emote cooldown, return true to allow the emote to happen
modular_skyrat/modules/admin/code/aooc.dm
+2 -2
View File
@@ -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.ooccolor) ? C.prefs.ooccolor : GLOB.AOOC_COLOR
var/name = (mode == AOOC_LISTEN_ADMIN && anon) ? "([key])[keyname]" : keyname
to_chat(C, "<font color='[color]'><b><span class='prefix'>AOOC:</span> <EM>[name]:</EM> <span class='message linkify'>[msg]</span></b></font>")
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>")
#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, "<B>The AOOC channel has been globally [GLOB.aooc_allowed ? "enabled" : "disabled"].</B>")
to_chat(C, "<span class='oocplain'><B>The AOOC channel has been globally [GLOB.aooc_allowed ? "enabled" : "disabled"].</B></span>")
/datum/admins/proc/toggleaooc()
set category = "Server"
modular_skyrat/modules/admin/code/sooc.dm
+2 -2
View File
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
var/mode = listeners[c]
var/color = (!anon && CONFIG_GET(flag/allow_admin_ooccolor) && C.prefs.ooccolor) ? C.prefs.ooccolor : GLOB.SOOC_COLOR
var/name = (mode == SOOC_LISTEN_ADMIN && anon) ? "([key])[keyname]" : keyname
to_chat(C, "<font color='[color]'><b><span class='prefix'>SOOC:</span> <EM>[name]:</EM> <span class='message linkify'>[msg]</span></b></font>")
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>")
#undef SOOC_LISTEN_PLAYER
#undef SOOC_LISTEN_ADMIN
@@ -101,7 +101,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name)
listeners[M.client] = TRUE
for(var/c in listeners)
var/client/C = c
to_chat(C, "<B>The SOOC channel has been globally [GLOB.sooc_allowed ? "enabled" : "disabled"].</B>")
to_chat(C, "<span class='oocplain'><B>The SOOC channel has been globally [GLOB.sooc_allowed ? "enabled" : "disabled"].</B></span>")
/datum/admins/proc/togglesooc()
set category = "Server"
modular_skyrat/modules/combat_indicator/code/combat_indicator.dm
+1 -1
View File
@@ -30,7 +30,7 @@ GLOBAL_VAR_INIT(combat_indicator_overlay, GenerateCombatOverlay())
nextcombatpopup = world.time + COMBAT_NOTICE_COOLDOWN
playsound(src, 'sound/machines/chime.ogg', 10, ignore_walls = FALSE)
flick_emote_popup_on_mob("combat", 20)
visible_message("<span class='boldwarning'>[src] gets ready for combat!</span>")
visible_message("<span class='warning'><b>[src] gets ready for combat!</b></span>")
add_overlay(GLOB.combat_indicator_overlay)
combat_indicator = TRUE
src.log_message("<font color='red'>has turned ON the combat indicator!</font>", INDIVIDUAL_ATTACK_LOG)
modular_skyrat/modules/ghostcafe/code/game/objects/structures/ghost_role_spawners.dm
+2 -2
View File
@@ -34,7 +34,7 @@
/area/centcom/holding/cafebuild, /area/centcom/holding/cafevox, /area/centcom/holding/cafedorms, /area/centcom/holding/cafepark, /area/centcom/holding/cafeplumbing))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, GHOSTROLE_TRAIT)
to_chat(new_spawn,"<span class='boldwarning'>Ghosting is free!</span>")
to_chat(new_spawn,"<span class='warning'><b>Ghosting is free!</b></span>")
var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
D.Grant(new_spawn)
@@ -64,7 +64,7 @@
/area/centcom/holding/cafebuild, /area/centcom/holding/cafevox, /area/centcom/holding/cafedorms, /area/centcom/holding/cafepark, /area/centcom/holding/cafeplumbing))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, GHOSTROLE_TRAIT)
to_chat(new_spawn,"<span class='boldwarning'>Ghosting is free!</span>")
to_chat(new_spawn,"<span class='warning'><b>Ghosting is free!</b></span>")
//to_chat(new_spawn,"<span class='narsiesmall'>Be warned: People who opt out of EORG will come here. Do not make the area uninhabitable and do NOT commit EORG. This is a safe-zone. If you attack people in EORG, you will be banned for griefing.</span>")
var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
D.Grant(new_spawn)
modular_skyrat/modules/gunpoint/code/datum/gunpoint/gunpoint_datum.dm
+3 -3
View File
@@ -92,8 +92,8 @@
locked = TRUE
log_combat(target, source, "locked onto with aiming")
playsound(get_turf(source), 'modular_skyrat/modules/gunpoint/sound/targeton.ogg', 50,1)
to_chat(source, "<span class='boldnotice'>You lock onto [target.name]!</span>")
target.visible_message("<span class='boldwarning'>[source.name] holds [target.name] at gunpoint with the [aimed_gun.name]!</span>", "<span class='userdanger'>[source.name] holds you at gunpoint with the [aimed_gun.name]!</span>")
to_chat(source, "<span class='notice'><b>You lock onto [target.name]!</b></span>")
target.visible_message("<span class='warning'><b>[source.name] holds [target.name] at gunpoint with the [aimed_gun.name]!</b></span>", "<span class='userdanger'>[source.name] holds you at gunpoint with the [aimed_gun.name]!</span>")
if(target.gunpointed.len == 1)//First case
to_chat(target, "<span class='danger'>You'll <b>get shot</b> if you <b>use radio</b>, <b>move</b> or <b>interact with items</b>!</span>")
to_chat(target, "<span class='notice'>You can however take items out, toss harmless items or drop them.</span>")
@@ -131,7 +131,7 @@
source.gunpointing = null
if(locked)
QDEL_NULL(gunpoint_gui)
target.visible_message("<span class='notice'>[source.name] no longer holds [target.name] at gunpoint.</span>", "<span class='boldnotice'>[source.name] no longer holds you at gunpoint.</span>")
target.visible_message("<span class='notice'>[source.name] no longer holds [target.name] at gunpoint.</span>", "<span class='notice'><b>[source.name] no longer holds you at gunpoint.</b></span>")
source = null
target = null
aimed_gun = null
modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm
+4 -4
View File
@@ -38,9 +38,9 @@
var/datum/action/innate/turn_to_human
var/datum/action/innate/devour
var/transformed_time = 0
var/playstyle_string = "<b><font size=3 color='red'>We have entered our true form!</font> We are unbelievably powerful, and regenerate life at a steady rate. However, most of \
var/playstyle_string = "<span class=infoplain><b><font size=3 color='red'>We have entered our true form!</font> We are unbelievably powerful, and regenerate life at a steady rate. However, most of \
our abilities are useless in this form, and we must utilise the abilities that we have gained as a result of our transformation. Currently, we are incapable of returning to a human. \
After several minutes, we will once again be able to revert into a human. Taking too much damage will cause us to reach equilibrium and our cells will combust into a shower of gore, watch out!</b>"
After several minutes, we will once again be able to revert into a human. Taking too much damage will cause us to reach equilibrium and our cells will combust into a shower of gore, watch out!</b></span>"
var/mob/living/carbon/human/stored_changeling = null //The changeling that transformed
var/devouring = FALSE //If the true changeling is currently devouring a human
@@ -71,7 +71,7 @@
if(stat)
return
if(act == "scream")
message = "<B>[src]</B> makes a loud, bone-chilling roar!"
message = "<span class='emote'><B>[src]</B> makes a loud, bone-chilling roar!</span>"
act = "me"
scream(message)
return
@@ -79,7 +79,7 @@
/mob/living/simple_animal/hostile/true_changeling/proc/scream(message)
if(!message)
message = "<B>[src]</B> makes a loud, bone-chilling roar!"
message = "<span class='emote'><B>[src]</B> makes a loud, bone-chilling roar!</span>"
var/frequency = get_rand_frequency() //so sound frequency is consistent
for(var/mob/M in range(35, src)) //You can hear the scream 7 screens away
// Double check for client
modular_skyrat/modules/mentor/code/mentorhelp.dm
+2 -2
View File
@@ -15,7 +15,7 @@
return
var/show_char = CONFIG_GET(flag/mentors_mobname_only)
var/mentor_msg = "<span class='mentornotice'><b><font color='purple'>MENTORHELP:</b> <b>[key_name_mentor(src, 1, 0, 1, show_char)]</b>: [msg]</font></span>"
var/mentor_msg = "<span class='infoplain'><span class='mentornotice'><b><font color='purple'>MENTORHELP:</b> <b>[key_name_mentor(src, 1, 0, 1, show_char)]</b>: [msg]</font></span></span>"
log_mentor("MENTORHELP: [key_name_mentor(src, 0, 0, 0, 0)]: [msg]")
for(var/it in GLOB.mentors)
@@ -23,7 +23,7 @@
SEND_SOUND(X, 'sound/items/bikehorn.ogg')
to_chat(X, mentor_msg)
to_chat(src, "<span class='mentornotice'><font color='purple'>PM to-<b>Mentors</b>: [msg]</font></span>")
to_chat(src, "<span class='infoplain'><span class='mentornotice'><font color='purple'>PM to-<b>Mentors</b>: [msg]</font></span></span>")
return
/proc/get_mentor_counts()
modular_skyrat/modules/mentor/code/mentorpm.dm
+10 -10
View File
@@ -32,7 +32,7 @@
return
if(is_mentor(whom))
to_chat(GLOB.mentors, "<font color='purple'>[src] has started replying to [whom]'s mhelp.</font>")
to_chat(GLOB.mentors, "<span class='infoplain'><font color='purple'>[src] has started replying to [whom]'s mhelp.</font></span>")
//get message text, limit it's length.and clean/escape html
if(!msg)
@@ -40,7 +40,7 @@
if(!msg)
if (is_mentor(whom))
to_chat(GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
to_chat(GLOB.mentors, "<span class='infoplain'><span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span></span>")
return
if(!C)
@@ -57,7 +57,7 @@
msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
if(!msg)
if (is_mentor(whom))
to_chat(GLOB.mentors, "<span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span>")
to_chat(GLOB.mentors, "<span class='infoplain'><span class='purple'>[src] has stopped their reply to [whom]'s mhelp.</span></span>")
return
log_mentor("Mentor PM: [key_name(src)]->[key_name(C)]: [msg]")
@@ -66,17 +66,17 @@
var/show_char = CONFIG_GET(flag/mentors_mobname_only)
if(C.is_mentor())
if(is_mentor())//both are mentors
to_chat(C, "<span class='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
to_chat(src, "<span class='blue'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</font>")
to_chat(C, "<span class='infoplain'><span class='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span></span>")
to_chat(src, "<span class='infoplain'><span class='blue'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span></span>")
else //recipient is a mentor but sender is not
to_chat(C, "<span class='purple'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</span>")
to_chat(src, "<span class='pink'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
to_chat(C, "<span class='infoplain'><span class='purple'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</span></span>")
to_chat(src, "<span class='infoplain'><span class='pink'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span></span>")
else
if(is_mentor()) //sender is a mentor but recipient is not.
to_chat(C, "<span class='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
to_chat(src, "<span class='pink'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</span>")
to_chat(C, "<span class='infoplain'><span class='purple'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span></span>")
to_chat(src, "<span class='infoplain'><span class='pink'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</span></span>")
//we don't use message_Mentors here because the sender/receiver might get it too
var/show_char_sender = !is_mentor() && CONFIG_GET(flag/mentors_mobname_only)
@@ -84,4 +84,4 @@
for(var/it in GLOB.mentors)
var/client/X = it
if(X.key!=key && X.key!=C.key) //check client/X is an Mentor and isn't the sender or recipient
to_chat(X, "<B><span class='pink'>Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]-&gt;[key_name_mentor(C, X, 0, 0, show_char_recip)]:</span></B> <span class='blue'>[msg]</span>") //inform X
to_chat(X, "<span class='infoplain'><B><span class='pink'>Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]-&gt;[key_name_mentor(C, X, 0, 0, show_char_recip)]:</span></B> <span class='blue'>[msg]</span></span>") //inform X
modular_skyrat/modules/mentor/code/mentorsay.dm
+2 -2
View File
@@ -13,7 +13,7 @@
log_mentor("MSAY: [key_name(src)] : [msg]")
if(check_rights_for(src, R_ADMIN,0))
msg = "<b><font color ='#8A2BE2'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
msg = "<span class='infoplain'><b><font color ='#8A2BE2'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b></span>"
else
msg = "<b><font color ='#E236D8'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
msg = "<span class='infoplain'><b><font color ='#E236D8'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b></span>"
to_chat(GLOB.admins | GLOB.mentors, msg)
modular_skyrat/modules/mentor/code/mentorwho.dm
+1 -1
View File
@@ -18,5 +18,5 @@
if(C.is_afk())
suffix += " (AFK)"
msg += "\t[C][suffix]\n"
msg += "<span class='infoplain'>\t[C][suffix]\n</span>"
to_chat(src, msg)
modular_skyrat/modules/verbs/code/modules/client/preferences_toggles.dm
+1 -1
View File
@@ -5,5 +5,5 @@
set desc = "Toggles seeing LocalOutOfCharacter chat"
usr.client.prefs.skyrat_toggles ^= CHAT_LOOC
usr.client.prefs.save_preferences()
to_chat(usr, "You will [(usr.client.prefs.skyrat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.")
to_chat(usr, "<span class='infoplain'>You will [(usr.client.prefs.skyrat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.</span>")
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing LOOC", "[usr.client.prefs.skyrat_toggles & CHAT_LOOC ? "Enabled" : "Disabled"]"))
modular_skyrat/modules/verbs/code/modules/client/verbs/looc.dm
+2 -2
View File
@@ -21,7 +21,7 @@
if(handle_spam_prevention(msg,MUTE_OOC))
return
if(findtext(msg, "byond://"))
to_chat(src, "<B>Advertising other servers is not allowed.</B>")
to_chat(src, "<span class='boldannounce'><B>Advertising other servers is not allowed.</B></span>")
log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
return
if(mob.stat)
@@ -65,5 +65,5 @@
return
prefs.skyrat_toggles ^= CHAT_LOOC_ADMIN
prefs.save_preferences()
to_chat(usr, "You will [(prefs.skyrat_toggles & CHAT_LOOC_ADMIN) ? "now" : "no longer"] hear LOOC globally.")
to_chat(usr, "<span class='infoplain'>You will [(prefs.skyrat_toggles & CHAT_LOOC_ADMIN) ? "now" : "no longer"] hear LOOC globally.</span>")
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Togle Admin LOOC", "[usr.client.prefs.skyrat_toggles & CHAT_LOOC_ADMIN ? "Enabled" : "Disabled"]"))
tgui/packages/tgui-panel/chat/constants.js
+1 -1
View File
@@ -82,7 +82,7 @@ export const MESSAGE_TYPES = [
type: MESSAGE_TYPE_OOC,
name: 'OOC',
description: 'The bluewall of global OOC messages',
selector: '.ooc, .adminooc, .oocplain, .looc',
selector: '.ooc, .adminooc, .oocplain, .looc, .rlooc',
},
{
type: MESSAGE_TYPE_ADMINPM,