From d4aa410af0932ad12fc886bb06e1e09e76b80e0c Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 2 Feb 2020 23:18:30 +0100 Subject: [PATCH 1/4] Update atoms.dm --- code/game/atoms.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 960e1cc513..83117bad64 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -767,6 +767,8 @@ log_whisper(log_text) if(LOG_EMOTE) log_emote(log_text) + if(LOG_SUBTLER) + log_subtler(log_text) if(LOG_DSAY) log_dsay(log_text) if(LOG_PDA) @@ -869,4 +871,4 @@ Proc for attack log creation, because really why not return TRUE /atom/proc/intercept_zImpact(atom/movable/AM, levels = 1) - . |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels) \ No newline at end of file + . |= SEND_SIGNAL(src, COMSIG_ATOM_INTERCEPT_Z_FALL, AM, levels) From ff0f9b5de870a51e676a88dc522f7465a4d7968f Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 2 Feb 2020 23:24:02 +0100 Subject: [PATCH 2/4] Update say_vr.dm --- code/modules/mob/say_vr.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 38438b97ce..de704306da 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -109,7 +109,7 @@ proc/get_top_level_mob(var/mob/S) if(!can_run_emote(user)) return FALSE - user.log_message(message, INDIVIDUAL_EMOTE_LOG) + user.log_message(message, LOG_EMOTE) message = "[user] " + "[message]" for(var/mob/M in GLOB.dead_mob_list) @@ -123,10 +123,7 @@ proc/get_top_level_mob(var/mob/S) user.audible_message(message=message,hearing_distance=1) else user.visible_message(message=message,self_message=message,vision_distance=1) - log_emote("[key_name(user)] : [message]") - message = null - emote_type = EMOTE_VISIBLE ///////////////// SUBTLE 2: NO GHOST BOOGALOO @@ -173,16 +170,13 @@ proc/get_top_level_mob(var/mob/S) if(!can_run_emote(user)) return FALSE - user.log_message(message, INDIVIDUAL_EMOTE_LOG) + user.log_message(message, LOG_SUBTLER) message = "[user] " + "[message]" if(emote_type == EMOTE_AUDIBLE) user.audible_message(message=message,hearing_distance=1, ignored_mobs = GLOB.dead_mob_list) else user.visible_message(message=message,self_message=message,vision_distance=1, ignored_mobs = GLOB.dead_mob_list) - log_emote("[key_name(user)] : (SUBTLER) [message]") - - message = null ///////////////// VERB CODE /mob/living/verb/subtle() From f1e32615660347b10214821940f2941072381c71 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 2 Feb 2020 23:26:03 +0100 Subject: [PATCH 3/4] Update _logging.dm --- code/__HELPERS/_logging.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index db8f4a1d0d..2d53b86c57 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -94,6 +94,10 @@ if (CONFIG_GET(flag/log_emote)) WRITE_LOG(GLOB.world_game_log, "EMOTE: [text]") +/proc/log_subtler(text) + if (CONFIG_GET(flag/log_emote)) + WRITE_LOG(GLOB.world_game_log, "EMOTE (SUBTLER): [text]") + /proc/log_prayer(text) if (CONFIG_GET(flag/log_prayer)) WRITE_LOG(GLOB.world_game_log, "PRAY: [text]") From aa41815119f48c7214b0a3d9135a68cd2477fcfa Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 3 Feb 2020 00:31:53 +0100 Subject: [PATCH 4/4] Update logging.dm --- code/__DEFINES/logging.dm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index fe50319295..7e385638c5 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -24,18 +24,19 @@ #define LOG_SAY (1 << 1) #define LOG_WHISPER (1 << 2) #define LOG_EMOTE (1 << 3) -#define LOG_DSAY (1 << 4) -#define LOG_PDA (1 << 5) -#define LOG_CHAT (1 << 6) -#define LOG_COMMENT (1 << 7) -#define LOG_TELECOMMS (1 << 8) -#define LOG_OOC (1 << 9) -#define LOG_ADMIN (1 << 10) -#define LOG_OWNERSHIP (1 << 11) -#define LOG_GAME (1 << 12) -#define LOG_ADMIN_PRIVATE (1 << 13) -#define LOG_ASAY (1 << 14) -#define LOG_VIRUS (1 << 15) +#define LOG_SUBTLER (1 << 4) +#define LOG_DSAY (1 << 5) +#define LOG_PDA (1 << 6) +#define LOG_CHAT (1 << 7) +#define LOG_COMMENT (1 << 8) +#define LOG_TELECOMMS (1 << 9) +#define LOG_OOC (1 << 10) +#define LOG_ADMIN (1 << 11) +#define LOG_OWNERSHIP (1 << 12) +#define LOG_GAME (1 << 13) +#define LOG_ADMIN_PRIVATE (1 << 14) +#define LOG_ASAY (1 << 15) +#define LOG_VIRUS (1 << 16) //Individual logging panel pages #define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK)