Merge branch 'dev' of github.com:danielyxie/bitburner into dev

src/Hacknet/HacknetServer.ts

@@ -20,6 +20,8 @@ import { createRandomIp } from "../utils/IPAddress";
 
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../utils/JSONReviver";
 
+
+
 interface IConstructorParams {
   adminRights?: boolean;
   hostname: string;

src/Locations/ui/SpecialLocation.tsx

@@ -21,6 +21,7 @@ import { LocationName } from "../data/LocationNames";
 import { use } from "../../ui/Context";
 
 import { dialogBoxCreate } from "../../ui/React/DialogBox";
+import { SnackbarEvents } from "../../ui/React/Snackbar";
 
 type IProps = {
   loc: Location;
@@ -75,7 +76,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
 
   function renderNoodleBar(): React.ReactElement {
     function EatNoodles(): void {
-      dialogBoxCreate(<>You ate some delicious noodles and feel refreshed.</>);
+      SnackbarEvents.emit("You ate some delicious noodles and feel refreshed", "success");
     }
 
     return <Button onClick={EatNoodles}>Eat noodles</Button>;
@@ -111,7 +112,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
 
   function renderCotMG(): React.ReactElement {
     // prettier-ignore
-    const symbol = <Typography sx={{lineHeight: '1em',whiteSpace: 'pre'}}>
+    const symbol = <Typography sx={{ lineHeight: '1em', whiteSpace: 'pre' }}>
       {"                 ``          "}<br />
       {"             -odmmNmds:      "}<br />
       {"           `hNmo:..-omNh.    "}<br />

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -59,6 +59,7 @@ import { Money } from "../../ui/React/Money";
 
 import React from "react";
 import { serverMetadata } from "../../Server/data/servers";
+import { SnackbarEvents } from "../../ui/React/Snackbar";
 
 export function init(this: IPlayer): void {
   /* Initialize Player's home computer */
@@ -1697,13 +1698,7 @@ export function regenerateHp(this: IPlayer, amt: number): void {
 export function hospitalize(this: IPlayer): number {
   const cost = getHospitalizationCost(this);
   if (Settings.SuppressHospitalizationPopup === false) {
-    dialogBoxCreate(
+    SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, "warning");
-      <>
-        You were in critical condition! You were taken to the hospital where luckily they were able to save your life.
-        You were charged&nbsp;
-        <Money money={cost} />
-      </>,
-    );
   }
 
   this.loseMoney(cost);

src/ui/React/Theme.tsx

@@ -302,7 +302,7 @@ export function refreshTheme(): void {
             border: "1px solid " + Settings.theme.well,
           },
           standardSuccess: {
-            color: Settings.theme.primaryLight,
+            color: Settings.theme.primarylight,
           },
           standardError: {
             color: Settings.theme.errorlight,