Skip to content

Commit e5a6a2c

Browse files
committed
set quick icons and fix Monkestation#5333
1 parent 2f11d90 commit e5a6a2c

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

monkestation/code/datums/quirks/negative_quirks/language_quirks.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
/datum/quirk/language_holder/uncommon
2020
name = "Uncommon"
21-
desc = "You don't understand Galactic Common, having instead learned Galactic Uncommon."
21+
desc = "You don't understand Galactic Common having learned Galactic Uncommon instead."
2222
icon = FA_ICON_LANGUAGE
2323
value = -6
2424
gain_text = span_notice("The words being spoken around you don't make any sense.")
@@ -29,7 +29,7 @@
2929
/datum/quirk/language_holder/outsider
3030
name = "Outsider"
3131
desc = "You don't know your species' language."
32-
icon = FA_ICON_LANGUAGE
32+
icon = FA_ICON_BAN
3333
value = -2
3434
gain_text = span_notice("You can't understand your species' language.")
3535
lose_text = span_notice("You've remembered your species' language.")
@@ -38,7 +38,7 @@
3838
/datum/quirk/language_holder/listener
3939
name = "Listener"
4040
desc = "You are unable to speak Galactic Common though you understand it just fine."
41-
icon = FA_ICON_VOLUME_LOW
41+
icon = FA_ICON_EYE
4242
value = -3
4343
gain_text = span_notice("You don't know how to speak Galactic Common.")
4444
lose_text = span_notice("You're able to speak Galactic Common.")

tgui/packages/tgui/interfaces/NtosLifeline.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,17 @@ const NtosLifelineContent = () => {
8686
(crew: CrewSensor) => crew.name + crew.assignment,
8787
);
8888

89+
const jobIsCommand = (jobId: number) => {
90+
return (
91+
(jobIsHead(jobId) &&
92+
jobId !== 50) /* QMs are heads of staff but not command */ ||
93+
(jobId >= 200 && jobId < 300)
94+
);
95+
};
96+
8997
const sorted = sensors
9098
.filter(nameSearch)
91-
.filter(
92-
(sensor) =>
93-
!blueshield ||
94-
jobIsHead(sensor.ijob) ||
95-
(sensor.ijob >= 200 && sensor.ijob < 300),
96-
)
99+
.filter((sensor) => !blueshield || jobIsCommand(sensor.ijob))
97100
.sort((a, b) => {
98101
if (a.dist < 0 || b.dist < 0) {
99102
return b.dist - a.dist;

0 commit comments

Comments
 (0)