Merge remote-tracking branch 'citadel/master' into backend_sync

tgui/packages/tgui-dev-server/package.json

@@ -9,6 +9,6 @@
     "glob": "^7.1.6",
     "source-map": "^0.7.3",
     "stacktrace-parser": "^0.1.10",
-    "ws": "^7.4.4"
+    "ws": "^7.4.6"
   }
 }

tgui/packages/tgui/interfaces/ForbiddenLore.js

@@ -7,7 +7,7 @@ import { Window } from '../layouts';
 export const ForbiddenLore = (props, context) => {
   const { act, data } = useBackend(context);
   const {
-    charges,
+    charges, total_sacs,
   } = data;
   const to_know = flow([
     sortBy(to_know => to_know.state !== "Research",
@@ -21,6 +21,8 @@ export const ForbiddenLore = (props, context) => {
       <Window.Content scrollable>
         <Section title="Research Eldritch Knowledge">
           Charges left : {charges}
+          <br />
+          Completed Sacrifices : {total_sacs}
           {to_know!== null ? (
             to_know.map(knowledge => (
               <Section
@@ -39,7 +41,8 @@ export const ForbiddenLore = (props, context) => {
                       cost: knowledge.cost,
                     })} />
                   {' '}
-                  Cost : {knowledge.cost}
+                  Cost : {knowledge.cost}  
+                  | Sacrifices Required : {knowledge.sacs}
                 </Box >
                 <Box italic my={1}>
                   {knowledge.flavour}

tgui/packages/tgui/interfaces/Orbit.js

@@ -165,7 +165,7 @@ export const Orbit = (props, context) => {
           </Flex>
         </Section>
         {antagonists.length > 0 && (
-          <Section title="Ghost-Visible Antagonists">
+          <Section title="Visible Antagonists">
             {sortedAntagonists.map(([name, antags]) => (
               <Section key={name} title={name} level={2}>
                 {antags