From 37a0b30a2e8de314192d39b670c496e7de0edf3f Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Mon, 9 Sep 2024 17:16:44 -0700 Subject: [PATCH] Add examine_block to all examined mobs --- code/__defines/chat.dm | 3 +++ code/modules/examine/examine.dm | 5 ++++- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- code/modules/mob/living/silicon/ai/examine.dm | 6 +++--- code/modules/mob/living/silicon/pai/examine.dm | 4 ++-- code/modules/mob/living/silicon/robot/examine.dm | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/__defines/chat.dm b/code/__defines/chat.dm index 1a9ac039146..3fb1d2e2dde 100644 --- a/code/__defines/chat.dm +++ b/code/__defines/chat.dm @@ -34,3 +34,6 @@ #define MESSAGE_TYPE_ADMINLOG "adminlog" #define MESSAGE_TYPE_ATTACKLOG "attacklog" #define MESSAGE_TYPE_DEBUG "debug" + +/// Adds a generic box around whatever message you're sending in chat. Really makes things stand out. +#define examine_block(str) ("
" + str + "
") diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index a97dc00bfd0..7bec7ed2c29 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -112,7 +112,10 @@ var/list/results = A.examine(src) if(!results || !results.len) results = list("You were unable to examine that. Tell a developer!") - to_chat(src, "[jointext(results, "
")]
") + var/final_string = "[jointext(results, "
")]
" + if(ismob(A)) // mob descriptions matter more than others + final_string = examine_block(final_string) + to_chat(src, final_string) update_examine_panel(A) /mob/proc/update_examine_panel(var/atom/A) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d72299dcac2..fe2ef072f70 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -101,7 +101,7 @@ else if(species.name != "Human") name_ender = ", \a [species.get_examine_name()]![species.get_additional_examine_text(src)]" - var/list/msg = list("*---------*","This is [icon2html(src, user.client)] [src.name][name_ender]") + var/list/msg = list("","This is [icon2html(src, user.client)] [src.name][name_ender]") //uniform if(w_uniform && !(skip_gear & EXAMINE_SKIPJUMPSUIT) && w_uniform.show_examine) @@ -440,7 +440,7 @@ msg += "OOC Notes: \[View\] - \[Print\]" msg += "\[Mechanical Vore Preferences\]" // VOREStation End - msg += "*---------*" + msg += "" if(applying_pressure) msg += applying_pressure diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 1aa9517938e..c1f07188bb1 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -28,11 +28,11 @@ if(deployed_shell) . += "The wireless networking light is blinking." - . += "*---------*" - + . += "" + if(hardware && (hardware.owner == src)) . += hardware.get_examine_desc() - + user.showLaws(src) /mob/proc/showLaws(var/mob/living/silicon/S) diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index 812f00c0052..4446562c751 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -6,12 +6,12 @@ if(!src.client) . += "It appears to be in stand-by mode." //afk if(UNCONSCIOUS) . += "It doesn't seem to be responding." if(DEAD) . += "It looks completely unsalvageable." - + // VOREStation Edit: Start . += attempt_vr(src,"examine_bellies",args) //VOREStation Edit if(print_flavor_text()) . += "\n[print_flavor_text()]\n" // VOREStation Edit: End - . += "*---------*" + . += "" if (pose) if(!findtext(pose, regex("\[.?!]$"))) // Will be zero if the last character is not a member of [.?!] pose = addtext(pose,".") //Makes sure all emotes end with a period. diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index f9d5663a777..1a86f2277fa 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -34,7 +34,7 @@ . += attempt_vr(src,"examine_bellies_borg",args) //VOREStation Edit // VOREStation Edit: End - . += "*---------*" + . += "" if(print_flavor_text()) . += "
[print_flavor_text()]"