-
- act('grab', {
- alt: event.altKey,
- ctrl: event.ctrlKey,
- ref: item.ref,
- shift: event.shiftKey,
- })
- }
- onContextMenu={(event) => {
- event.preventDefault();
- act('grab', {
- right: true,
- ref: item.ref,
- });
- }}
- >
-
- {amount > 1 &&
{amount}
}
-
-
{name}
+ // So we can conditionally wrap tooltip
+ const content = (
+
+
+ act('grab', {
+ alt: event.altKey,
+ ctrl: event.ctrlKey,
+ ref: item.ref,
+ shift: event.shiftKey,
+ })
+ }
+ onContextMenu={(event) => {
+ event.preventDefault();
+ act('grab', {
+ right: true,
+ ref: item.ref,
+ });
+ }}
+ >
+
+ {amount > 1 &&
{amount}
}
-
+ {!is_blind &&
{name}}
+
);
+
+ if (is_blind) return content;
+
+ return
{content};
}
diff --git a/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx b/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx
index cdbb49f715fca9..5fa92583f2e517 100644
--- a/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx
+++ b/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx
@@ -70,7 +70,7 @@ const Thresholds = (props) => {
/** Displays the numerical trait modifiers for a virus symptom */
const Traits = (props) => {
const {
- symptom: { level, resistance, stage_speed, stealth, transmission },
+ symptom: { level, weight, resistance, stage_speed, stealth, transmission },
} = props;
return (
@@ -81,6 +81,11 @@ const Traits = (props) => {
{level}
+
+
+ {weight}
+
+
{resistance}
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index a9e7e11117a9e9..8436073fe97cb6 100644
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -92,6 +92,11 @@ if $grep -i'centcomm' $map_files; then
echo -e "${RED}ERROR: Misspelling(s) of CentCom detected in maps, please remove the extra M(s).${NC}"
st=1
fi;
+if $grep -i'eciev' $map_files; then
+ echo
+ echo -e "${RED}ERROR: Common I-before-E typo detected in maps.${NC}"
+ st=1
+fi;
section "whitespace issues"
part "space indentation"
@@ -205,6 +210,11 @@ if $grep 'NanoTrasen' $code_files; then
echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T(s).${NC}"
st=1
fi;
+if $grep -i'eciev' $code_files; then
+ echo
+ echo -e "${RED}ERROR: Common I-before-E typo detected in code.${NC}"
+ st=1
+fi;
part "map json naming"
if ls _maps/*.json | $grep "[A-Z]"; then
echo