From 33a90f242735e6bac6b5bf2ea9969575e0eb185c Mon Sep 17 00:00:00 2001 From: Superlagg Date: Sun, 21 Apr 2024 12:32:07 -0700 Subject: [PATCH] flossy nossy nihila fillapication --- code/__DEFINES/span.dm | 1 + code/controllers/subsystem/chat.dm | 41 +++++++++++-------- code/controllers/subsystem/monster_wave.dm | 4 +- .../modules/mob/dead/new_player/new_player.dm | 18 ++++---- .../client/verbs/character_directory.dm | 12 ++++-- .../tgui-panel/styles/goon/chat-dark.scss | 17 ++++++++ .../tgui-panel/styles/goon/chat-light.scss | 20 ++++++++- 7 files changed, 78 insertions(+), 35 deletions(-) diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 7d688efe77d..5d7e558e70a 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -72,6 +72,7 @@ #define span_holoparasite(str) ("" + str + "") #define span_hypnophrase(str) ("" + str + "") #define span_private(str) ("" + str + "") +#define span_private_sent(str) ("" + str + "") #define span_urgent(str) ("" + str + "") #define span_softlove(str) ("" + str + "") #define span_glitch(str) ("" + str + "") diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index 4bcc1ec7bae..240525ed048 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -295,6 +295,8 @@ SUBSYSTEM_DEF(chat) to_chat(sender, span_warning("Module failed to load.")) return var/theirname = name_or_shark(reciever) || "some jerk" // stop. naming. your. ckeys. after. your characcteres!!!!!!!!!!!!!!!!!! + if(check_rights(R_ADMIN, FALSE)) + theirname = "[theirname] - [extract_ckey(reciever)]" // we're an admin, we can see their name var/mesage = input( sender, "Enter your message to [theirname]. This will send a direct message to them, which they can reply to! Be sure to respect their OOC preferences, don't be a creep (unless they like it), and have fun!", @@ -303,17 +305,22 @@ SUBSYSTEM_DEF(chat) ) as message|null if(!mesage) return - var/myname = name_or_shark(sender) || "some jerk" + var/myname = name_or_shark(sender) || "Anonymouse" + if(check_rights(R_ADMIN, FALSE)) + myname = "[myname] - [extract_ckey(sender)]" // we're an admin, we can see their name + var/payload2them = "From [dm_linkify(reciever, sender, myname)]: [mesage]
" payload2them = span_private(payload2them) to_chat(reciever, span_private("
You have a new message from [name_or_shark(sender) || "Some jerk"]!")) to_chat(reciever, payload2them) + reciever.playsound_local(reciever, 'sound/effects/direct_message_recieved.ogg', 75, FALSE) + var/payload2me = "To [dm_linkify(sender, reciever, theirname)]: [mesage]
" - payload2me = span_private(payload2me) - to_chat(sender, span_private("
Your message to [theirname] has been sent!")) + payload2me = span_private_sent(payload2me) + to_chat(sender, span_private_sent("
Your message to [theirname] has been sent!")) to_chat(sender, payload2me) sender.playsound_local(sender, 'sound/effects/direct_message_setn.ogg', 75, FALSE) - reciever.playsound_local(reciever, 'sound/effects/direct_message_recieved.ogg', 75, FALSE) + log_ooc("[sender.real_name] ([sender.ckey]) -> [reciever.real_name] ([reciever.ckey]): [mesage]") message_admins("[ADMIN_TPMONTY(sender)] -DM-> [ADMIN_TPMONTY(reciever)]: [mesage]", ADMIN_CHAT_FILTER_DMS) @@ -327,7 +334,7 @@ SUBSYSTEM_DEF(chat) reciever = extract_mob(reciever) if(!reciever || !reciever.client) return - var/theirname = optional_name || name_or_shark(reciever) || "some jerk" // stop. naming. your. ckeys. after. your characcteres!!!!!!!!!!!!!!!!!! + var/theirname = optional_name || name_or_shark(reciever) || "Anonymouse" // stop. naming. your. ckeys. after. your characcteres!!!!!!!!!!!!!!!!!! return "[theirname]" /datum/controller/subsystem/chat/Topic(href, list/href_list) @@ -342,19 +349,21 @@ SUBSYSTEM_DEF(chat) if(!istype(they)) return "Nobody" if(check_rights(R_ADMIN, FALSE)) - return they.real_name // we're an admin, we can see their name - if(isnewplayer(they)) - return they.client.prefs.my_shark + return they.name || they.real_name if(ckey(they.real_name) == ckey(they.ckey) || ckey(they.name) == ckey(they.ckey)) - if(strings("data/super_special_ultra_instinct.json", "[ckey(they.name)]", TRUE, TRUE)) - return they.name - if(strings("data/super_special_ultra_instinct.json", "[ckey(they.real_name)]", TRUE, TRUE)) - return they.real_name if(they.client) - return they.client.prefs.my_shark - else - return "Some jerk" - return they.name + var/test_name = they.client.prefs.real_name + if(ckey(test_name) == ckey(they.ckey)) + if(strings("data/super_special_ultra_instinct.json", "[ckey(test_name)]", TRUE, TRUE)) + return test_name + if(strings("data/super_special_ultra_instinct.json", "[ckey(they.name)]", TRUE, TRUE)) + return test_name + if(strings("data/super_special_ultra_instinct.json", "[ckey(they.real_name)]", TRUE, TRUE)) + return test_name + return they.client.prefs.my_shark + return test_name + return safepick(GLOB.cow_names + GLOB.megacarp_first_names + GLOB.megacarp_last_names) + return they.real_name /datum/controller/subsystem/chat/proc/inspect_character(mob/viewer, list/payload) if(!viewer) diff --git a/code/controllers/subsystem/monster_wave.dm b/code/controllers/subsystem/monster_wave.dm index f13f34216ba..3a05ef5f030 100644 --- a/code/controllers/subsystem/monster_wave.dm +++ b/code/controllers/subsystem/monster_wave.dm @@ -180,8 +180,8 @@ SUBSYSTEM_DEF(monster_wave) /mob/living/simple_animal/nest_spawn_hole_guy/ComponentInitialize() . = ..() - RegisterSignal(src, COMSIG_HOSTILE_CHECK_FACTION,PROC_REF(no_attack_pls)) - RegisterSignal(src, COMSIG_MOB_APPLY_DAMAGE,PROC_REF(im_hit)) + RegisterSignal(src, COMSIG_HOSTILE_CHECK_FACTION,PROC_REF(no_attack_pls), TRUE) + RegisterSignal(src, COMSIG_MOB_APPLY_DAMAGE,PROC_REF(im_hit), TRUE) /mob/living/simple_animal/nest_spawn_hole_guy/update_overlays() . = ..() diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index b3fbba3cb9f..bf8a17195cf 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -60,29 +60,21 @@ output += "

Configure Quirks!

" if(SSticker.current_state <= GAME_STATE_PREGAME) - /* - switch(ready) - if(PLAYER_NOT_READY) - output += "

\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | Not Ready | [LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)] \]

" - if(PLAYER_READY_TO_PLAY) - output += "

\[ Ready | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | [LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)] \]

" - if(PLAYER_READY_TO_OBSERVE) - output += "

\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | Observe \]

" - */ output += "

Please be patient, the game is starting soon!

" output += "

(Refresh)

" output += "

(Fix Chat Window)

" output += "

(Fit Viewport)

" else output += "

View the Crew Manifest

" + output += "

View Character Directory

" output += "

Join Game!

" output += "

[LINKIFY_READY("Observe", PLAYER_READY_TO_OBSERVE)]

" output += "

Join as Simple Creature!

" output += "

(Fix Chat Window)

" output += "

(Fit Viewport)

" - if(!IsGuestKey(src.key)) - output += playerpolls() + // if(!IsGuestKey(src.key)) + // output += playerpolls() output += "
" @@ -185,6 +177,10 @@ client.prefs.ShowChoices(src) return 1 + if(href_list["directory"]) + client.show_character_directory() + return 1 + if(href_list["quirkconversion"]) SSquirks.ConvertOldQuirklistToNewQuirklist(client.prefs) new_player_panel() diff --git a/modular_splurt/code/datums/modules/client/verbs/character_directory.dm b/modular_splurt/code/datums/modules/client/verbs/character_directory.dm index 94cf716a69d..09a26b18640 100644 --- a/modular_splurt/code/datums/modules/client/verbs/character_directory.dm +++ b/modular_splurt/code/datums/modules/client/verbs/character_directory.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP var/mob/M = C?.mob if(!M) continue - var/name = C.prefs.real_name || M.real_name || M.name + var/name = SSchat.name_or_shark(M) //C.prefs.real_name || M.real_name || M.name var/thegender = capitalize(C.prefs.gender || M.gender || "Other") var/whokisser = "Unsure" var/species @@ -98,9 +98,13 @@ GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP whokisser = "Likes Anyone" if(KISS_NONE) whokisser = "Not Interested" - - if((isdead(M) && (lowertext(M.real_name) == M.ckey || lowertext(M.name) == M.ckey))) - name = C.prefs.my_shark + + if(isdead(M) && lowertext(name) == ckey(M.ckey)) + var/testname = C.prefs.real_name + if(lowertext(testname) == M.ckey) + name = C.prefs.my_shark + else + name = testname // It's okay if we fail to find OOC notes and flavor text // But if we can't find the name, they must be using a non-compatible mob type currently. if(!name) diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 8d34515f619..eba5362afd6 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -1044,6 +1044,23 @@ em { } } + +.privateSent { + color: #007f5f; + // font-weight: bold; + animation: privateSent 3000ms; + animation-direction: linear; +} + +@keyframes privateSent { + 0% { + color: #00FF00; + } + 100% { + color: #007f5f; + } +} + .phobia { color: #dd0000; font-weight: bold; diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 549e7172068..a16ea2aaf28 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -1103,7 +1103,7 @@ h1.alert, h2.alert { } .private { - color: #00BB80; + color: #00563b; // font-weight: bold; animation: private 3000ms; animation-direction: linear; @@ -1123,7 +1123,23 @@ h1.alert, h2.alert { color: #00FF00; } 100% { - color: #00BB80; + color: #00563b; + } +} + +.privateSent { + color: #002c21; + // font-weight: bold; + animation: privateSent 3000ms; + animation-direction: linear; +} + +@keyframes privateSent { + 0% { + color: #00FF00; + } + 100% { + color: #002c21; } }