Skip to content

Commit

Permalink
removes all <hr>
Browse files Browse the repository at this point in the history
bold names in get_examine_name()
cleaned up plant analyzer output formatting
adjust colors of examine_block class
remove \a from borg examine()
  • Loading branch information
13spacemen committed Jun 24, 2022
1 parent 79c81ab commit 74d6742
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 70 deletions.
8 changes: 3 additions & 5 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -602,10 +602,10 @@
* [COMSIG_ATOM_GET_EXAMINE_NAME] signal
*/
/atom/proc/get_examine_name(mob/user)
. = "\a [src]"
. = "\a <b>[src]</b>"
var/list/override = list(gender == PLURAL ? "some" : "a", " ", "[name]")
if(article)
. = "[article] [src]"
. = "[article] <b>[src]</b>"
override[EXAMINE_POSITION_ARTICLE] = article
if(SEND_SIGNAL(src, COMSIG_ATOM_GET_EXAMINE_NAME, user, override) & COMPONENT_EXNAME_CHANGED)
. = override.Join("")
Expand Down Expand Up @@ -637,20 +637,18 @@
* Produces a signal [COMSIG_PARENT_EXAMINE]
*/
/atom/proc/examine(mob/user)
. = list("[get_examine_string(user, TRUE)][!get_examine_string() ? null : ".<hr>"]")
. = list("[get_examine_string(user, TRUE)][!get_examine_string() ? null : "."]")

. += get_name_chaser(user)
if(desc)
. += desc

if(custom_materials)
. += "<hr>"
var/list/materials_list = list()
for(var/datum/material/current_material as anything in custom_materials)
materials_list += "[current_material.name]"
. += "<u>It is made out of [english_list(materials_list)]</u>."
if(reagents)
. += "<hr>"
if(reagents.flags & TRANSPARENT)
. += "It contains:"
if(length(reagents.reagent_list))
Expand Down
76 changes: 32 additions & 44 deletions code/modules/hydroponics/hydroitemdefines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,12 @@
returned_message += "[span_bold("[scanned_tray.myseed.plantname]")]"
returned_message += "\nPlant Age: [span_notice("[scanned_tray.age]")]"
returned_message += "\nPlant Health: [span_notice("[scanned_tray.plant_health]")]"
returned_message += "<hr>"
returned_message += scan_plant_stats(scanned_tray.myseed)
returned_message += "<hr>"
returned_message += scan_plant_stats(scanned_tray.myseed, TRUE)
returned_message += "\n<b>Growth medium</b>"
else
returned_message += span_bold("No plant found.\n")
returned_message += span_bold("No plant found.")

returned_message += "Weed level: [span_notice("[scanned_tray.weedlevel] / [MAX_TRAY_WEEDS]")]"
returned_message += "\nWeed level: [span_notice("[scanned_tray.weedlevel] / [MAX_TRAY_WEEDS]")]"
returned_message += "\nPest level: [span_notice("[scanned_tray.pestlevel] / [MAX_TRAY_PESTS]")]"
returned_message += "\nToxicity level: [span_notice("[scanned_tray.toxic] / [MAX_TRAY_TOXINS]")]"
returned_message += "\nWater level: [span_notice("[scanned_tray.waterlevel] / [scanned_tray.maxwater]")]"
Expand All @@ -201,22 +200,16 @@
if(scanned_tray.myseed)
returned_message += "[span_bold("[scanned_tray.myseed.plantname]")]"
returned_message += "\nPlant Age: [span_notice("[scanned_tray.age]")]"
returned_message += "<hr>"
returned_message += scan_plant_chems(scanned_tray.myseed)
returned_message += "<hr>"
returned_message += scan_plant_chems(scanned_tray.myseed, TRUE)
else
returned_message += span_bold("No plant found.\n")
returned_message += span_bold("No plant found.")

returned_message += "Tray contains:\n"
returned_message += "\nGrowth medium contains:"
if(scanned_tray.reagents.reagent_list.len)
var/newline = FALSE
for(var/datum/reagent/reagent_id in scanned_tray.reagents.reagent_list)
if(newline)
returned_message += "\n"
returned_message += "[span_notice("&bull; [reagent_id.volume] / [scanned_tray.maxnutri] units of [reagent_id]")]"
newline = TRUE
returned_message += "\n[span_notice("&bull; [reagent_id.volume] / [scanned_tray.maxnutri] units of [reagent_id]")]"
else
returned_message += "[span_notice("No reagents found.")]"
returned_message += "\n[span_notice("No reagents found.")]"

return span_info(returned_message)

Expand All @@ -228,16 +221,20 @@
*
* Returns the formatted output as text.
*/
/obj/item/plant_analyzer/proc/scan_plant_stats(obj/item/scanned_object)
var/returned_message = "This is [span_name("\a [scanned_object]")]."
/obj/item/plant_analyzer/proc/scan_plant_stats(obj/item/scanned_object, in_tray = FALSE)
var/returned_message = ""
if(!in_tray)
returned_message += "This is [span_name("\a [scanned_object]")]."
else
returned_message += "\n<b>Seed Stats</b>"
var/obj/item/seeds/our_seed = scanned_object
if(!istype(our_seed)) //if we weren't passed a seed, we were passed a plant with a seed
our_seed = scanned_object.get_plant_seed()

if(our_seed && istype(our_seed))
returned_message += get_analyzer_text_traits(our_seed)
else
returned_message += "<hr>No genes found."
returned_message += "\nNo genes found."

return span_info(returned_message)

Expand All @@ -249,8 +246,12 @@
*
* Returns the formatted output as text.
*/
/obj/item/plant_analyzer/proc/scan_plant_chems(obj/item/scanned_object)
var/returned_message = "This is [span_name("\a [scanned_object]")]."
/obj/item/plant_analyzer/proc/scan_plant_chems(obj/item/scanned_object, in_tray = FALSE)
var/returned_message = ""
if(!in_tray)
returned_message += "This is [span_name("\a [scanned_object]")]."
else
returned_message += "\n<b>Seed Stats</b>"
var/obj/item/seeds/our_seed = scanned_object
if(!istype(our_seed)) //if we weren't passed a seed, we were passed a plant with a seed
our_seed = scanned_object.get_plant_seed()
Expand All @@ -260,7 +261,7 @@
else if (our_seed.reagents_add?.len) //we have a seed with reagent genes
returned_message += get_analyzer_text_chem_genes(our_seed)
else
returned_message += "<hr>No reagents found."
returned_message += "\nNo reagents found."

return span_info(returned_message)

Expand Down Expand Up @@ -313,8 +314,7 @@
QDEL_NULL(scanned_graft_result) //graft genes are stored as typepaths so if we want to get their formatted name we need a datum ref - musn't forget to clean up afterwards
var/unique_text = scanned.get_unique_analyzer_text()
if(unique_text)
text += "<hr>"
text += unique_text
text += "\n[unique_text]"
return text

/**
Expand All @@ -325,15 +325,9 @@
* Returns the formatted output as text.
*/
/obj/item/plant_analyzer/proc/get_analyzer_text_chem_genes(obj/item/seeds/scanned)
var/text = ""
text += "\nPlant Reagent Genes"
text += "<hr>"
var/newline = FALSE
var/text = "\nPlant Reagent Genes:"
for(var/datum/plant_gene/reagent/gene in scanned.genes)
if(newline)
text += "\n"
text += "[gene.get_name()]"
newline = TRUE
text += "\n&bull; [gene.get_name()]"
return text

/**
Expand All @@ -346,24 +340,19 @@
/obj/item/plant_analyzer/proc/get_analyzer_text_chem_contents(obj/item/scanned_plant)
var/text = ""
var/reagents_text = ""
text += "\nPlant Reagents"
text += "\nMaximum reagent capacity: [scanned_plant.reagents.maximum_volume]"
text += "\nPlant Reagents:"
var/chem_cap = 0
var/newline = FALSE
for(var/_reagent in scanned_plant.reagents.reagent_list)
var/datum/reagent/reagent = _reagent
var/amount = reagent.volume
chem_cap += reagent.volume
if(newline)
reagents_text += "\n"
reagents_text += "&bull; [reagent.name]: [amount]"
newline = TRUE
reagents_text += "\n&bull; [reagent.name]: [amount]"
if(reagents_text)
text += reagents_text
text += "\nMaximum reagent capacity: [scanned_plant.reagents.maximum_volume]"
if(chem_cap > 100)
text += "\n[span_danger("Reagent Traits Over 100% Production")]"

if(reagents_text)
text += "<hr>"
text += reagents_text
return text

/**
Expand All @@ -379,8 +368,7 @@
text += "\nParent Plant: [span_notice("[scanned_graft.parent_name]")]"
if(scanned_graft.stored_trait)
text += "\nGraftable Traits: [span_notice("[scanned_graft.stored_trait.get_name()]")]"
text += "<hr>"
text += "Yield: [span_notice("[scanned_graft.yield]")]"
text += "\nYield: [span_notice("[scanned_graft.yield]")]"
text += "\nProduction speed: [span_notice("[scanned_graft.production]")]"
text += "\nEndurance: [span_notice("[scanned_graft.endurance]")]"
text += "\nLifespan: [span_notice("[scanned_graft.lifespan]")]"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@

visible_message(span_notice("[src] examines [p_them()]self."))

combined_msg += span_notice("You check yourself for injuries.")
combined_msg += span_notice("<b>You check yourself for injuries.</b>")

var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/robot/examine.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/mob/living/silicon/robot/examine(mob/user)
. = list("<span class='info'>This is [icon2html(src, user)] \a <EM>[src]</EM>!")
. = list("<span class='info'>This is [icon2html(src, user)] <EM>[src]</EM>!")
if(desc)
. += "[desc]"

Expand Down
3 changes: 1 addition & 2 deletions code/modules/mob/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,7 @@

if(result.len)
for(var/i in 1 to (length(result) - 1))
if(!findtext(result[i], "<hr>"))
result[i] += "\n"
result[i] += "\n"

to_chat(src, examine_block("<span class='infoplain'>[result.Join()]</span>"))
SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify)
Expand Down
11 changes: 2 additions & 9 deletions tgui/packages/tgui-panel/styles/goon/chat-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -901,20 +901,13 @@ em {
}

.examine_block {
background: rgba(0, 0, 0, 0.2);
border: 1px solid rgba(55, 55, 55, 0.33);
background: #1b1c1e;
border: 1px solid #a4bad6;
margin: 7px 4px;
padding: 8px 12px;
max-width: 550px;
}

.examine_block hr {
border: none;
background: #222;
height: 1px;
margin: 8px 16px 8px 16px;
}

.tooltip {
font-style: italic;
border-bottom: 1px dashed #fff;
Expand Down
9 changes: 1 addition & 8 deletions tgui/packages/tgui-panel/styles/goon/chat-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -934,20 +934,13 @@ h1.alert, h2.alert {
}

.examine_block {
background: rgba(0, 0, 0, 0.1);
background: #f2f7fa;
border: 1px solid #111a27;
margin: 2px 8px;
padding: 8px 12px;
max-width: 550px;
}

.examine_block hr {
border: none;
background: #333;
height: 1px;
margin: 8px 16px 8px 16px;
}

.tooltip {
font-style: italic;
border-bottom: 1px dashed #000;
Expand Down

0 comments on commit 74d6742

Please sign in to comment.