cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Absorb message filter & slightly brighter general radio colour in darkmode (#7093)

Browse Source 
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2023-10-24 17:46:19 -07:00
committed by GitHub
parent 98b09d6133
commit bcfb9e232d
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/modules/mob/say_vr.dm
View File

@@ -286,14 +286,14 @@
return
else
pb = db.pred_body
to_chat(pb, "<span class='changeling'>The captive mind of \the [M] thinks, \"[message]\"</span>") //To our pred if dominated brain
to_chat(pb, "<span class='psay'>The captive mind of \the [M] thinks, \"[message]\"</span>") //To our pred if dominated brain
if(pb.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
pb << sound(pick(voice_sounds_list), volume = 25)
f = TRUE
else if(M.absorbed && isbelly(M.loc))
pb = M.loc.loc
to_chat(pb, "<span class='changeling'>\The [M] thinks, \"[message]\"</span>") //To our pred if absorbed
to_chat(pb, "<span class='psay'>\The [M] thinks, \"[message]\"</span>") //To our pred if absorbed
if(pb.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
pb << sound(pick(voice_sounds_list), volume = 25)
@@ -304,7 +304,7 @@
for(var/I in pb.contents)
if(istype(I, /mob/living/dominated_brain) && I != M)
var/mob/living/dominated_brain/db = I
to_chat(db, "<span class='changeling'>The captive mind of \the [M] thinks, \"[message]\"</span>") //To any dominated brains in the pred
to_chat(db, "<span class='psay'>The captive mind of \the [M] thinks, \"[message]\"</span>") //To any dominated brains in the pred
if(db.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
db << sound(pick(voice_sounds_list), volume = 25)
@@ -312,7 +312,7 @@
for(var/B in pb.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed && L != M && L.ckey)
to_chat(L, "<span class='changeling'>\The [M] thinks, \"[message]\"</span>") //To any absorbed people in the pred
to_chat(L, "<span class='psay'>\The [M] thinks, \"[message]\"</span>") //To any absorbed people in the pred
if(L.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
L << sound(pick(voice_sounds_list), volume = 25)
@@ -322,7 +322,7 @@
for(var/I in M.contents)
if(istype(I, /mob/living/dominated_brain))
var/mob/living/dominated_brain/db = I
to_chat(db, "<span class='changeling'><b>\The [M] thinks, \"[message]\"</b></span>") //To any dominated brains inside us
to_chat(db, "<span class='psay'><b>\The [M] thinks, \"[message]\"</b></span>") //To any dominated brains inside us
if(db.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
db << sound(pick(voice_sounds_list), volume = 25)
@@ -330,7 +330,7 @@
for(var/B in M.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed)
to_chat(L, "<span class='changeling'><b>\The [M] thinks, \"[message]\"</b></span>") //To any absorbed people inside us
to_chat(L, "<span class='psay'><b>\The [M] thinks, \"[message]\"</b></span>") //To any absorbed people inside us
if(L.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
L << sound(pick(voice_sounds_list), volume = 25)
@@ -338,12 +338,12 @@
if(f) //We found someone to send the message to
if(pb)
to_chat(M, "<span class='changeling'>You think \"[message]\"</span>") //To us if we are the prey
to_chat(M, "<span class='psay'>You think \"[message]\"</span>") //To us if we are the prey
if(M.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
else
to_chat(M, "<span class='changeling'><b>You think \"[message]\"</b></span>") //To us if we are the pred
to_chat(M, "<span class='psay'><b>You think \"[message]\"</b></span>") //To us if we are the pred
if(M.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
@@ -352,7 +352,7 @@
continue
else if(isobserver(G) && G.is_preference_enabled(/datum/client_preference/ghost_ears))
if(is_preference_enabled(/datum/client_preference/whisubtle_vis) || G.client.holder)
to_chat(G, "<span class='changeling'>\The [M] thinks, \"[message]\"</span>")
to_chat(G, "<span class='psay'>\The [M] thinks, \"[message]\"</span>")
log_say(message,M)
else //There wasn't anyone to send the message to, pred or prey, so let's just say it instead and correct our psay just in case.
M.forced_psay = FALSE
@@ -390,7 +390,7 @@
return
else
pb = db.pred_body
to_chat(pb, "<span class='changeling'>\The [M] [message]</span>") //To our pred if dominated brain
to_chat(pb, "<span class='psay'>\The [M] [message]</span>") //To our pred if dominated brain
if(pb.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
pb << sound(pick(voice_sounds_list), volume = 25)
@@ -398,7 +398,7 @@
else if(M.absorbed && isbelly(M.loc))
pb = M.loc.loc
to_chat(pb, "<span class='changeling'>\The [M] [message]</span>") //To our pred if absorbed
to_chat(pb, "<span class='psay'>\The [M] [message]</span>") //To our pred if absorbed
if(pb.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
pb << sound(pick(voice_sounds_list), volume = 25)
@@ -409,7 +409,7 @@
for(var/I in pb.contents)
if(istype(I, /mob/living/dominated_brain) && I != M)
var/mob/living/dominated_brain/db = I
to_chat(db, "<span class='changeling'>\The [M] [message]</span>") //To any dominated brains in the pred
to_chat(db, "<span class='psay'>\The [M] [message]</span>") //To any dominated brains in the pred
if(pb.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
pb << sound(pick(voice_sounds_list), volume = 25)
@@ -417,7 +417,7 @@
for(var/B in pb.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed && L != M && L.ckey)
to_chat(L, "<span class='changeling'>\The [M] [message]</span>") //To any absorbed people in the pred
to_chat(L, "<span class='psay'>\The [M] [message]</span>") //To any absorbed people in the pred
if(L.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
L << sound(pick(voice_sounds_list), volume = 25)
@@ -427,7 +427,7 @@
for(var/I in M.contents)
if(istype(I, /mob/living/dominated_brain))
var/mob/living/dominated_brain/db = I
to_chat(db, "<span class='changeling'><b>\The [M] [message]</b></span>") //To any dominated brains inside us
to_chat(db, "<span class='psay'><b>\The [M] [message]</b></span>") //To any dominated brains inside us
if(db.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
db << sound(pick(voice_sounds_list), volume = 25)
@@ -435,7 +435,7 @@
for(var/B in M.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed)
to_chat(L, "<span class='changeling'><b>\The [M] [message]</b></span>") //To any absorbed people inside us
to_chat(L, "<span class='psay'><b>\The [M] [message]</b></span>") //To any absorbed people inside us
if(L.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
L << sound(pick(voice_sounds_list), volume = 25)
@@ -443,12 +443,12 @@
if(f) //We found someone to send the message to
if(pb)
to_chat(M, "<span class='changeling'>\The [M] [message]</span>") //To us if we are the prey
to_chat(M, "<span class='psay'>\The [M] [message]</span>") //To us if we are the prey
if(M.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
else
to_chat(M, "<span class='changeling'><b>\The [M] [message]</b></span>") //To us if we are the pred
to_chat(M, "<span class='psay'><b>\The [M] [message]</b></span>") //To us if we are the pred
if(M.is_preference_enabled(/datum/client_preference/say_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
@@ -457,7 +457,7 @@
continue
else if(isobserver(G) && G.is_preference_enabled(/datum/client_preference/ghost_ears))
if(is_preference_enabled(/datum/client_preference/whisubtle_vis) || G.client.holder)
to_chat(G, "<span class='changeling'>\The [M] [message]</span>")
to_chat(G, "<span class='pemote'>\The [M] [message]</span>")
log_say(message,M)
else //There wasn't anyone to send the message to, pred or prey, so let's just emote it instead and correct our psay just in case.
M.forced_psay = FALSE

9
code/modules/vchat/css/ss13styles.css
View File

@@ -102,6 +102,7 @@ body.inverted {
.deadsay {color: #530FAD;}
.inverted .deadsay {color: #732FCD;} /* Dark mode */
.radio {color: #008000;}
.inverted .radio {color: #00a800;} /* Dark mode */
.deptradio {color: #ff00ff;} /* when all other department colors fail */
.newscaster {color: #750000;}
@@ -129,7 +130,13 @@ body.inverted {
.inverted .emote {color: #FFFFFF;}
.alert {color: #ff0000;}
h1.alert, h2.alert {color: #000000;}
.nif {} /* VOREStation Add */
/* VOREStation Add Start */
.nif {}
.psay {color: #800080;font-style: italic;}
.inverted .psay {color: #e300e4;font-style: italic;}
.pemote {color: #800080;font-style: italic;}
.inverted .pemote {color: #e300e4;font-style: italic;}
/* VOREStation Add End */
/* Game Messages */

8
code/modules/vchat/js/vchat.js
View File

@@ -209,6 +209,14 @@ function start_vue() {
required: false,
admin: false
},
{
matches: ".psay, .pemote",
becomes: "vc_pmessage",
pretty: "Pred/Prey Messages",
tooltip: "Messages from / to absorbed or dominated prey",
required: false,
admin: false
},
//VOREStation Add End
{
matches: ".mentor_channel, .mentor",

2
code/modules/vchat/js/vchat.min.js vendored
View File

File diff suppressed because one or more lines are too long