From 6b16c8b1a0d4b1e931544842fb8cc3e4aa2f82fa Mon Sep 17 00:00:00 2001
From: afterthought2 <36152617+afterthought2@users.noreply.github.com>
Date: Mon, 14 Dec 2020 09:44:29 -0500
Subject: [PATCH 1/2] Merge pull request #1029 from
SierraKomodo/medical-minor-highlights
Make minor noticeable in body scans
---
code/_helpers/medical_scans.dm | 10 +++-
html/browser/common.css | 57 +++++++++++--------
.../sierrakomodo-medical-minor-highlights.yml | 37 ++++++++++++
nano/css/shared.css | 9 ++-
4 files changed, 85 insertions(+), 28 deletions(-)
create mode 100644 html/changelogs/sierrakomodo-medical-minor-highlights.yml
diff --git a/code/_helpers/medical_scans.dm b/code/_helpers/medical_scans.dm
index 352e7b9f26a..b833e4aa58f 100644
--- a/code/_helpers/medical_scans.dm
+++ b/code/_helpers/medical_scans.dm
@@ -312,7 +312,7 @@
else if(I["is_bruised"])
row += "| Moderate | "
else if(I["is_damaged"])
- row += "Minor | "
+ row += "Minor | "
else
row += "None | "
row += ""
@@ -367,7 +367,6 @@
/proc/get_severity(amount, var/tag = FALSE)
if(!amount)
return "none"
- . = "minor"
if(amount > 50)
if(tag)
. = "severe"
@@ -382,4 +381,9 @@
if(tag)
. = "moderate"
else
- . = "moderate"
\ No newline at end of file
+ . = "moderate"
+ else
+ if (tag)
+ .= "minor"
+ else
+ .= "minor"
diff --git a/html/browser/common.css b/html/browser/common.css
index 0342b67c62c..0cdb414c32a 100644
--- a/html/browser/common.css
+++ b/html/browser/common.css
@@ -1,5 +1,5 @@
-body
-{
+body
+{
padding: 0;
margin: 0;
background-color: #272727;
@@ -15,8 +15,8 @@ hr
}
a, a:link, a:visited, a:active, .linkOn, .linkOff, input
-{
- color: #ffffff;
+{
+ color: #ffffff;
text-decoration: none;
background: #3f595e;
border: 1px solid #161616;
@@ -26,15 +26,15 @@ a, a:link, a:visited, a:active, .linkOn, .linkOff, input
white-space:nowrap;
}
-a:hover
-{
+a:hover
+{
color: #3f595e;
background: #ffffff;
}
a.white, a.white:link, a.white:visited, a.white:active
-{
- color: #3f595e;
+{
+ color: #3f595e;
text-decoration: none;
background: #ffffff;
border: 1px solid #161616;
@@ -43,22 +43,22 @@ a.white, a.white:link, a.white:visited, a.white:active
cursor:default;
}
-a.white:hover
-{
+a.white:hover
+{
color: #ffffff;
background: #3f595e;
}
.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover
-{
- color: #ffffff;
+{
+ color: #ffffff;
background: #aa5f36;
border-color: #202020;
}
.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff:hover
-{
- color: #ffffff;
+{
+ color: #ffffff;
background: #999999;
border-color: #666666;
}
@@ -90,15 +90,15 @@ li
padding: 0 0 2px 0;
}
-img, a img
-{
- border-style:none;
+img, a img
+{
+ border-style:none;
}
h1, h2, h3, h4, h5, h6
{
margin: 0;
- padding: 16px 0 8px 0;
+ padding: 16px 0 8px 0;
color: #517087;
}
@@ -148,7 +148,7 @@ h4
right:0px;
z-index: 10
}
-
+
.uiTitleButtons
{
position:fixed;
@@ -167,7 +167,7 @@ h4
}
.uiContent
-{
+{
clear: both;
padding: 8px;
font-family: Verdana, Geneva, sans-serif;
@@ -178,9 +178,14 @@ h4
color: #00ff00;
}
+.mild
+{
+ color: #e0d000;
+}
+
.average
{
- color: #d09000;
+ color: #f09000;
}
.bad
@@ -210,7 +215,7 @@ h4
}
.notice.icon
-{
+{
padding: 2px 4px 0 20px;
}
@@ -274,10 +279,16 @@ div.notice
background: #00ff00;
}
+.progressFill.mild
+{
+ color: #ffffff;
+ background: #e0d000;
+}
+
.progressFill.average
{
color: #ffffff;
- background: #d09000;
+ background: #f09000;
}
.progressFill.bad
diff --git a/html/changelogs/sierrakomodo-medical-minor-highlights.yml b/html/changelogs/sierrakomodo-medical-minor-highlights.yml
new file mode 100644
index 00000000000..47feba59356
--- /dev/null
+++ b/html/changelogs/sierrakomodo-medical-minor-highlights.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# admin
+#################################
+
+# Your name.
+author: SierraKomodo
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "'Mild' labels in medical scans are now highlighted in yellow and bold to make them more noticeable."
diff --git a/nano/css/shared.css b/nano/css/shared.css
index c6b43f7d8f0..675d850724e 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -166,6 +166,11 @@ abbr {
font-weight: bold;
}
+.mild {
+ color: #cda500;
+ font-weight: bold;
+}
+
.average {
color: #00ff00;
font-weight: bold;
@@ -576,7 +581,7 @@ div.notice {
text-align: center;
}
-table.fixed {
+table.fixed {
table-layout:fixed;
}
@@ -711,4 +716,4 @@ th.bot {
.redacted {
background-color: black;
color: black;
-}
\ No newline at end of file
+}
From 00e2cfa11fe7a988f84bc9ac2a569ef523a44b52 Mon Sep 17 00:00:00 2001
From: SkyratBot
Date: Mon, 14 Dec 2020 09:44:46 -0500
Subject: [PATCH 2/2] Make minor noticeable in body scans
|