From 1c0c7c6fa8cbc2c20f4a25457b934c61ffe4ec43 Mon Sep 17 00:00:00 2001
From: AShifter <loganr.lowe@gmail.com>
Date: Tue, 7 Mar 2017 18:53:41 -0700
Subject: Added ShiftLotto

Added ShiftLotto. It's a new shiftorium upgrade that lets you make (and
lose) codepoints FAST.
---
 ShiftOS.WinForms/Applications/ShiftLetters.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ShiftOS.WinForms/Applications/ShiftLetters.cs')

diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index f1c1d22..d11f6f6 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -50,7 +50,7 @@ namespace ShiftOS.WinForms.Applications
                 "shiftorium", "codepoints", "shiftletters", "shops", "mud", "notification", "namechanger",
                 "skinning", "skinloader", "calculator", "fileskimmer", "lua", "shiftnet", "terminal", "textpad"};
         List<String> contributorsWordlist = new List<string> { "philipadams", "carverh", "computelinux", "lempamo",
-                "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox"};
+                "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox", "ashifter"};
 
         List<string> osWordlist = new List<string>
         {
@@ -90,7 +90,8 @@ namespace ShiftOS.WinForms.Applications
             "vienna",
             "whistler",
             "windowsxp",
-            "windowsforworkgroups"
+            "windowsforworkgroups",
+            "shiftos"
         };
 
         public ShiftLetters()
-- 
cgit v1.2.3


From 53fa6d78a450eba6b824d006ad2b1afed535eafe Mon Sep 17 00:00:00 2001
From: Aren <aren.cllc@gmail.com>
Date: Wed, 8 Mar 2017 10:01:12 +0100
Subject: Fix the typo

It's been in here for far too long.
---
 ShiftOS.WinForms/Applications/ShiftLetters.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ShiftOS.WinForms/Applications/ShiftLetters.cs')

diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index d11f6f6..700df7e 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -50,7 +50,7 @@ namespace ShiftOS.WinForms.Applications
                 "shiftorium", "codepoints", "shiftletters", "shops", "mud", "notification", "namechanger",
                 "skinning", "skinloader", "calculator", "fileskimmer", "lua", "shiftnet", "terminal", "textpad"};
         List<String> contributorsWordlist = new List<string> { "philipadams", "carverh", "computelinux", "lempamo",
-                "wowmom", "michaeltheshifter", "arencclc", "therandommelon", "pfg", "craftxbox", "ashifter"};
+                "wowmom", "michaeltheshifter", "arencllc", "therandommelon", "pfg", "craftxbox", "ashifter"};
 
         List<string> osWordlist = new List<string>
         {
-- 
cgit v1.2.3


From a9754b7df28795b6bb2c5cfe04c1b38b19fb0d05 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Fri, 10 Mar 2017 12:29:28 -0500
Subject: Lock certain apps away when system offline.

---
 ShiftOS.WinForms/Applications/Artpad.cs            |  1 +
 ShiftOS.WinForms/Applications/Chat.cs              |  1 +
 ShiftOS.WinForms/Applications/Downloader.cs        |  1 +
 ShiftOS.WinForms/Applications/FormatEditor.cs      |  1 +
 ShiftOS.WinForms/Applications/GraphicPicker.cs     |  1 +
 ShiftOS.WinForms/Applications/MUDControlCentre.cs  |  1 +
 ShiftOS.WinForms/Applications/NameChanger.cs       |  1 +
 ShiftOS.WinForms/Applications/Pong.cs              |  1 +
 ShiftOS.WinForms/Applications/ShiftLetters.cs      |  1 +
 ShiftOS.WinForms/Applications/ShiftLotto.cs        |  1 +
 ShiftOS.WinForms/Applications/ShiftSweeper.cs      |  1 +
 ShiftOS.WinForms/Applications/Shifter.cs           |  1 +
 ShiftOS.WinForms/Applications/Shiftnet.cs          |  1 +
 .../Applications/ShiftoriumFrontend.cs             |  1 +
 ShiftOS.WinForms/HackerCommands.cs                 | 10 ++++++
 ShiftOS.WinForms/WinformsWindowManager.cs          | 18 ++++++++++
 ShiftOS_TheReturn/AppLauncherDaemon.cs             | 20 +++++++++---
 ShiftOS_TheReturn/KernelWatchdog.cs                | 38 +++++++++++++++++++++-
 ShiftOS_TheReturn/Scripting.cs                     |  7 ++--
 19 files changed, 100 insertions(+), 7 deletions(-)

(limited to 'ShiftOS.WinForms/Applications/ShiftLetters.cs')

diff --git a/ShiftOS.WinForms/Applications/Artpad.cs b/ShiftOS.WinForms/Applications/Artpad.cs
index 6c1bc1c..71f7afb 100644
--- a/ShiftOS.WinForms/Applications/Artpad.cs
+++ b/ShiftOS.WinForms/Applications/Artpad.cs
@@ -41,6 +41,7 @@ using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [Launcher("Artpad", true, "al_artpad", "Graphics")]
     [RequiresUpgrade("artpad")]
     [WinOpen("artpad")]
diff --git a/ShiftOS.WinForms/Applications/Chat.cs b/ShiftOS.WinForms/Applications/Chat.cs
index 06a7873..caf8cd2 100644
--- a/ShiftOS.WinForms/Applications/Chat.cs
+++ b/ShiftOS.WinForms/Applications/Chat.cs
@@ -36,6 +36,7 @@ using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     public partial class Chat : UserControl, IShiftOSWindow
     {
         public Chat(string chatId)
diff --git a/ShiftOS.WinForms/Applications/Downloader.cs b/ShiftOS.WinForms/Applications/Downloader.cs
index da90c6d..1f240bf 100644
--- a/ShiftOS.WinForms/Applications/Downloader.cs
+++ b/ShiftOS.WinForms/Applications/Downloader.cs
@@ -41,6 +41,7 @@ using System.IO.Compression;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [Launcher("Downloader", false, null, "Networking")]
     [DefaultIcon("iconDownloader")]
     public partial class Downloader : UserControl, IShiftOSWindow
diff --git a/ShiftOS.WinForms/Applications/FormatEditor.cs b/ShiftOS.WinForms/Applications/FormatEditor.cs
index ef44b47..56b0253 100644
--- a/ShiftOS.WinForms/Applications/FormatEditor.cs
+++ b/ShiftOS.WinForms/Applications/FormatEditor.cs
@@ -34,6 +34,7 @@ using System.Windows.Forms;
 using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Applications {
+    [MultiplayerOnly]
     [Launcher("FormatEditor", true, "al_format_editor", "Games")]
     [RequiresUpgrade("format_editor")]
     [WinOpen("formateditor")]
diff --git a/ShiftOS.WinForms/Applications/GraphicPicker.cs b/ShiftOS.WinForms/Applications/GraphicPicker.cs
index 2dfe7ec..b3dd8bf 100644
--- a/ShiftOS.WinForms/Applications/GraphicPicker.cs
+++ b/ShiftOS.WinForms/Applications/GraphicPicker.cs
@@ -37,6 +37,7 @@ using ShiftOS.WinForms.Tools;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [DefaultTitle("Choose graphic")] [DefaultIcon("icongraphicpicker")]
     public partial class GraphicPicker : UserControl, IShiftOSWindow
     {
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index 02fe868..e2668bd 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -38,6 +38,7 @@ using ShiftOS.WinForms.Tools;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [RequiresUpgrade("mud_fundamentals")]
     [Launcher("MUD Control Centre", true, "al_mud_control_centre", "Networking")]
     [WinOpen("mud_control_centre")]
diff --git a/ShiftOS.WinForms/Applications/NameChanger.cs b/ShiftOS.WinForms/Applications/NameChanger.cs
index ca76e57..d7c99f7 100644
--- a/ShiftOS.WinForms/Applications/NameChanger.cs
+++ b/ShiftOS.WinForms/Applications/NameChanger.cs
@@ -38,6 +38,7 @@ using ShiftOS.WinForms.Tools;
 
 namespace ShiftOS.WinForms.Applications {
 
+    [MultiplayerOnly]
     [Launcher("Name Changer", true, "al_name_changer", "Customization")]
     [RequiresUpgrade("name_changer")]
     [WinOpen("name_changer")]
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index af1e156..157ce8c 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -37,6 +37,7 @@ using ShiftOS.Objects;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [Launcher("Pong", true, "al_pong", "Games")]
     [WinOpen("pong")]
     [DefaultIcon("iconPong")]
diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index 700df7e..b5e9aa4 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -36,6 +36,7 @@ using System.Windows.Forms;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [Launcher("ShiftLetters", false, null, "Games")]
     [RequiresUpgrade("shiftletters")]
     [WinOpen("shiftletters")]
diff --git a/ShiftOS.WinForms/Applications/ShiftLotto.cs b/ShiftOS.WinForms/Applications/ShiftLotto.cs
index 7acba3e..33f357f 100644
--- a/ShiftOS.WinForms/Applications/ShiftLotto.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLotto.cs
@@ -35,6 +35,7 @@ using ShiftOS.Engine;
 namespace ShiftOS.WinForms.Applications
 {
     [Launcher("ShiftLotto", true, "al_shiftlotto", "Games")]
+    [MultiplayerOnly]
     [DefaultIcon("iconShiftLotto")]
     [RequiresUpgrade("shiftlotto")]
     [WinOpen("shiftlotto")]
diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
index b13880f..cf6d331 100644
--- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs
+++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
@@ -36,6 +36,7 @@ using ShiftOS.Engine;
 namespace ShiftOS.WinForms.Applications {
     [Launcher("ShiftSweeper", true, "al_shiftsweeper", "Games")]
     [RequiresUpgrade("shiftsweeper")]
+    [MultiplayerOnly]
     [WinOpen("shiftsweeper")]
     [DefaultIcon("iconShiftSweeper")]
     public partial class ShiftSweeper : UserControl, IShiftOSWindow {
diff --git a/ShiftOS.WinForms/Applications/Shifter.cs b/ShiftOS.WinForms/Applications/Shifter.cs
index 1adc75a..fe2bf20 100644
--- a/ShiftOS.WinForms/Applications/Shifter.cs
+++ b/ShiftOS.WinForms/Applications/Shifter.cs
@@ -40,6 +40,7 @@ using ShiftOS.WinForms.Tools;
 
 namespace ShiftOS.WinForms.Applications
 {
+    [MultiplayerOnly]
     [Launcher("Shifter", true, "al_shifter", "Customization")]
     [RequiresUpgrade("shifter")]
     [WinOpen("shifter")]
diff --git a/ShiftOS.WinForms/Applications/Shiftnet.cs b/ShiftOS.WinForms/Applications/Shiftnet.cs
index 45f37d4..c1c81d5 100644
--- a/ShiftOS.WinForms/Applications/Shiftnet.cs
+++ b/ShiftOS.WinForms/Applications/Shiftnet.cs
@@ -38,6 +38,7 @@ using ShiftOS.WinForms.Tools;
 
 namespace ShiftOS.WinForms.Applications {
     [Launcher("Shiftnet", false, null, "Networking")]
+    [MultiplayerOnly]
     [DefaultIcon("iconShiftnet")]
     public partial class Shiftnet : UserControl, IShiftOSWindow {
         public Shiftnet() {
diff --git a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
index b3724ae..0580b47 100644
--- a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
+++ b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
@@ -39,6 +39,7 @@ namespace ShiftOS.WinForms.Applications
 {
     [Launcher("Shiftorium", true, "al_shiftorium", "Utilities")]
     [RequiresUpgrade("shiftorium_gui")]
+    [MultiplayerOnly]
     [WinOpen("shiftorium")]
     [DefaultTitle("Shiftorium")]
     [DefaultIcon("iconShiftorium")]
diff --git a/ShiftOS.WinForms/HackerCommands.cs b/ShiftOS.WinForms/HackerCommands.cs
index 52d8568..d9504d3 100644
--- a/ShiftOS.WinForms/HackerCommands.cs
+++ b/ShiftOS.WinForms/HackerCommands.cs
@@ -668,5 +668,15 @@ namespace ShiftOS.WinForms
 
             return true;
         }
+
+        [Command("experience", description = "Marks a story plot as experienced without triggering the plot.", usage ="{id:}")]
+        [RequiresArgument("id")]
+        [RemoteLock]
+        public static bool Experience(Dictionary<string, object> args)
+        {
+            SaveSystem.CurrentSave.StoriesExperienced.Add(args["id"].ToString());
+            SaveSystem.SaveGame();
+            return true;
+        }
     }
 }
diff --git a/ShiftOS.WinForms/WinformsWindowManager.cs b/ShiftOS.WinForms/WinformsWindowManager.cs
index b8f0cae..eeaa6c9 100644
--- a/ShiftOS.WinForms/WinformsWindowManager.cs
+++ b/ShiftOS.WinForms/WinformsWindowManager.cs
@@ -106,6 +106,24 @@ namespace ShiftOS.WinForms
                 return;
             }
 
+            foreach(var attr in form.GetType().GetCustomAttributes(true))
+            {
+                if(attr is MultiplayerOnlyAttribute)
+                {
+                    if(KernelWatchdog.MudConnected == false)
+                    {
+                        Infobox.PromptYesNo("Disconnected from MUD", "This application requires a connection to the MUD. Would you like to reconnect?", new Action<bool>((answer) =>
+                        {
+                            if(answer == true)
+                            {
+                                KernelWatchdog.MudConnected = true;
+                                SetupWindow(form);
+                            }
+                        }));
+                        return;
+                    }
+                }
+            }
 
             if (!Shiftorium.UpgradeAttributesUnlocked(form.GetType()))
             {
diff --git a/ShiftOS_TheReturn/AppLauncherDaemon.cs b/ShiftOS_TheReturn/AppLauncherDaemon.cs
index 7ef34c1..5e3bd72 100644
--- a/ShiftOS_TheReturn/AppLauncherDaemon.cs
+++ b/ShiftOS_TheReturn/AppLauncherDaemon.cs
@@ -66,12 +66,24 @@ namespace ShiftOS.Engine
                                 {
                                     foreach (var attr in type.GetCustomAttributes(false))
                                     {
-                                        if (attr is LauncherAttribute)
+                                        bool isAllowed = true;
+                                        if(attr is MultiplayerOnlyAttribute)
                                         {
-                                            var launch = attr as LauncherAttribute;
-                                            if (launch.UpgradeInstalled)
+                                            if(KernelWatchdog.MudConnected == false)
                                             {
-                                                win.Add(new LauncherItem { DisplayData = launch, LaunchType = type });
+                                                isAllowed = false;
+
+                                            }
+                                        }
+                                        if (isAllowed == true)
+                                        {
+                                            if (attr is LauncherAttribute)
+                                            {
+                                                var launch = attr as LauncherAttribute;
+                                                if (launch.UpgradeInstalled)
+                                                {
+                                                    win.Add(new LauncherItem { DisplayData = launch, LaunchType = type });
+                                                }
                                             }
                                         }
                                     }
diff --git a/ShiftOS_TheReturn/KernelWatchdog.cs b/ShiftOS_TheReturn/KernelWatchdog.cs
index 1b59b25..e69c9ba 100644
--- a/ShiftOS_TheReturn/KernelWatchdog.cs
+++ b/ShiftOS_TheReturn/KernelWatchdog.cs
@@ -25,8 +25,44 @@ namespace ShiftOS.Engine
             }
         }
 
+        private static bool _mudConnected = true;
+
         public static bool InKernelMode { get; private set; }
-        public static bool MudConnected { get; set; }
+        public static bool MudConnected
+        {
+            get
+            {
+                return _mudConnected;
+            }
+            set
+            {
+                if(value == false)
+                {
+                    foreach(var win in AppearanceManager.OpenForms)
+                    {
+                        foreach(var attr in win.ParentWindow.GetType().GetCustomAttributes(true))
+                        {
+                            if(attr is MultiplayerOnlyAttribute)
+                            {
+                                ConsoleEx.Bold = true;
+                                ConsoleEx.Underline = false;
+                                ConsoleEx.Italic = true;
+                                ConsoleEx.ForegroundColor = ConsoleColor.Red;
+                                Console.Write("Error:");
+                                ConsoleEx.Bold = false;
+                                ConsoleEx.ForegroundColor = ConsoleColor.DarkYellow;
+                                Console.WriteLine("Cannot disconnect from multi-user domain because an app that depends on it is open.");
+                                TerminalBackend.PrintPrompt();
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                _mudConnected = value;
+                Desktop.PopulateAppLauncher();
+            }
+        }
 
         public static bool IsSafe(Type type)
         {
diff --git a/ShiftOS_TheReturn/Scripting.cs b/ShiftOS_TheReturn/Scripting.cs
index bb65dc7..6768efb 100644
--- a/ShiftOS_TheReturn/Scripting.cs
+++ b/ShiftOS_TheReturn/Scripting.cs
@@ -67,11 +67,14 @@ namespace ShiftOS.Engine.Scripting
         {
             ServerManager.MessageReceived += (msg) =>
             {
-                if(msg.Name == "run")
+                if (msg.Name == "run")
                 {
                     var cntnts = JsonConvert.DeserializeObject<dynamic>(msg.Contents);
                     var interp = new LuaInterpreter();
-                    interp.Execute(cntnts.script.ToString());
+                    Desktop.InvokeOnWorkerThread(() =>
+                    {
+                        interp.Execute(cntnts.script.ToString());
+                    });
                 }
             };
         }
-- 
cgit v1.2.3


From 80899fc5de1c0c194043ce94a10707bf8b7afcf0 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sun, 28 May 2017 10:12:59 -0400
Subject: Cool startup logo :smiley:

---
 ShiftOS.WinForms/Applications/ShiftLetters.cs      |   2 +-
 ShiftOS.WinForms/Applications/ShiftSweeper.cs      |   2 +-
 ShiftOS.WinForms/Resources/Shiftorium.txt          |  14 ---
 ShiftOS.WinForms/ShiftOS.WinForms.csproj           |   9 ++
 .../ShiftnetSites/ShiftGames.Designer.cs           |  74 ++++++++++++
 ShiftOS.WinForms/ShiftnetSites/ShiftGames.cs       |  39 +++++++
 ShiftOS.WinForms/ShiftnetSites/ShiftGames.resx     | 125 +++++++++++++++++++++
 ShiftOS_TheReturn/SaveSystem.cs                    |  26 +++++
 8 files changed, 275 insertions(+), 16 deletions(-)
 create mode 100644 ShiftOS.WinForms/ShiftnetSites/ShiftGames.Designer.cs
 create mode 100644 ShiftOS.WinForms/ShiftnetSites/ShiftGames.cs
 create mode 100644 ShiftOS.WinForms/ShiftnetSites/ShiftGames.resx

(limited to 'ShiftOS.WinForms/Applications/ShiftLetters.cs')

diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index b5e9aa4..42e19f8 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -38,7 +38,7 @@ namespace ShiftOS.WinForms.Applications
 {
     [MultiplayerOnly]
     [Launcher("ShiftLetters", false, null, "Games")]
-    [RequiresUpgrade("shiftletters")]
+    [AppscapeEntry("ShiftLetters", "Let's see how much you know about ShiftOS by playing this tiny little Hangman game! Shiftorium Upgrades exist to allow you to buy different word sets!", 300, 150, null, "Games")]
     [WinOpen("shiftletters")]
     [DefaultIcon("iconShiftLetters")]
     public partial class ShiftLetters : UserControl, IShiftOSWindow
diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
index 72e9062..f23ed73 100644
--- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs
+++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
@@ -35,7 +35,7 @@ using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Applications {
     [Launcher("ShiftSweeper", true, "al_shiftsweeper", "Games")]
-    [RequiresUpgrade("shiftsweeper")]
+    [AppscapeEntry("ShiftSweeper", "A simple Minesweeper game built for ShiftOS! Careful, it's a hard one.", 1600, 800, "shiftletters", "Games")]
     [MultiplayerOnly]
     [WinOpen("shiftsweeper")]
     [DefaultIcon("iconShiftSweeper")]
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index cc68c6f..41b50a7 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -151,13 +151,6 @@
 	},
 
 	// SHIFTLETTERS AND WORDLISTS
-	{
-		Name: "ShiftLetters",
-		Cost: 150,
-		Dependencies: null,
-		Category: "Applications",
-		Description: "Sick and tired of playing Pong? Buy this upgrade to get a whole new game!"
-	},
 	{
 		Name: "AL ShiftLetters",
 		Cost: 150,
@@ -1028,13 +1021,6 @@
 
 	// SHIFTSWEEPER
 
-	{
-		Name: "ShiftSweeper",
-		Cost: 800,
-		Dependencies: "shiftletters",
-		Category: "Applications",
-		Description: "Getting bored with Pong and ShiftLetters? Try this BRAND NEW game called ShiftSweeper!"
-	},
 	{
 		Name: "AL ShiftSweeper",
 		Cost: 100,
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index da8eafc..9844657 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -382,6 +382,12 @@
     <Compile Include="ShiftnetSites\MainHomepage.Designer.cs">
       <DependentUpon>MainHomepage.cs</DependentUpon>
     </Compile>
+    <Compile Include="ShiftnetSites\ShiftGames.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ShiftnetSites\ShiftGames.Designer.cs">
+      <DependentUpon>ShiftGames.cs</DependentUpon>
+    </Compile>
     <Compile Include="ShiftOSAudioProvider.cs" />
     <Compile Include="ShiftOSConfigFile.cs" />
     <Compile Include="SkinCommands.cs" />
@@ -574,6 +580,9 @@
     <EmbeddedResource Include="ShiftnetSites\MainHomepage.resx">
       <DependentUpon>MainHomepage.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ShiftnetSites\ShiftGames.resx">
+      <DependentUpon>ShiftGames.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UniteLoginDialog.resx">
       <DependentUpon>UniteLoginDialog.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftGames.Designer.cs b/ShiftOS.WinForms/ShiftnetSites/ShiftGames.Designer.cs
new file mode 100644
index 0000000..3b4bf9e
--- /dev/null
+++ b/ShiftOS.WinForms/ShiftnetSites/ShiftGames.Designer.cs
@@ -0,0 +1,74 @@
+namespace ShiftOS.WinForms.ShiftnetSites
+{
+    partial class ShiftGames
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShiftGames));
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label1.Location = new System.Drawing.Point(0, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(571, 65);
+            this.label1.TabIndex = 0;
+            this.label1.Tag = "header2";
+            this.label1.Text = "ShiftGames/Minimatch";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label2
+            // 
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(0, 65);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(571, 309);
+            this.label2.TabIndex = 1;
+            this.label2.Text = resources.GetString("label2.Text");
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // ShiftGames
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Name = "ShiftGames";
+            this.Size = new System.Drawing.Size(571, 374);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+    }
+}
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftGames.cs b/ShiftOS.WinForms/ShiftnetSites/ShiftGames.cs
new file mode 100644
index 0000000..4ce0435
--- /dev/null
+++ b/ShiftOS.WinForms/ShiftnetSites/ShiftGames.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ShiftOS.Engine;
+using ShiftOS.WinForms.Tools;
+
+namespace ShiftOS.WinForms.ShiftnetSites
+{
+    [ShiftnetSite("shiftnet/main/shiftgames", "ShiftGames (formerly Minimatch)", "The one true Shiftnet site for virus-free, quality games.")]
+    public partial class ShiftGames : UserControl, IShiftnetSite
+    {
+        public ShiftGames()
+        {
+            InitializeComponent();
+        }
+
+        public event Action GoBack;
+        public event Action<string> GoToUrl;
+
+        public void OnSkinLoad()
+        {
+            ControlManager.SetupControls(this);
+        }
+
+        public void OnUpgrade()
+        {
+        }
+
+        public void Setup()
+        {
+        }
+    }
+}
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftGames.resx b/ShiftOS.WinForms/ShiftnetSites/ShiftGames.resx
new file mode 100644
index 0000000..ef8aebe
--- /dev/null
+++ b/ShiftOS.WinForms/ShiftnetSites/ShiftGames.resx
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="label2.Text" xml:space="preserve">
+    <value>ShiftGames has been shut down as of May 2016. We have moved our inventory to the Appscape Repository. Thanks for being with us, and apologies for the inconvenience.
+
+Copyright (c) 2014-2016 Maureen Fenn</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index 24a491d..489b718 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -298,6 +298,32 @@ namespace ShiftOS.Engine
             if (CurrentSave.Users == null)
                 CurrentSave.Users = new List<ClientSave>();
 
+            Console.WriteLine($@"
+                   `-:/++++::.`                   
+              .+ydNMMMMMNNMMMMMNhs/.              
+           /yNMMmy+:-` `````.-/ohNMMms-           
+        `oNMMh/.`:oydmNMMMMNmhs+- .+dMMm+`             Welcome to ShiftOS.
+      `oMMmo``+dMMMMMMMMMMMMMMMMMNh/`.sNMN+       
+     :NMN+ -yMMMMMMMNdhyssyyhdmNMMMMNs``sMMd.          SYSTEM STATUS:
+    oMMd.`sMMMMMMd+.            `/MMMMN+ -mMN:         ----------------------
+   oMMh .mMMMMMM/     `-::::-.`  :MMMMMMh`.mMM:   
+  :MMd .NMMMMMMs    .dMMMMMMMMMNddMMMMMMMd`.NMN.        Codepoints:     {SaveSystem.CurrentSave.Codepoints}
+  mMM. dMMMMMMMo    -mMMMMMMMMMMMMMMMMMMMMs /MMy        Upgrades:       {SaveSystem.CurrentSave.CountUpgrades()} installed
+ :MMh :MMMMMMMMm`     .+shmMMMMMMMMMMMMMMMN` NMN`                       {Shiftorium.GetAvailable().Count()} available
+ oMM+ sMMMMMMMMMN+`        `-/smMMMMMMMMMMM: hMM:       Filesystems:    {Utils.Mounts.Count} filesystems mounted in memory.
+ sMM+ sMMMMMMMMMMMMds/-`        .sMMMMMMMMM/ yMM/ 
+ +MMs +MMMMMMMMMMMMMMMMMmhs:`     +MMMMMMMM- dMM-       System name:    {CurrentSave.SystemName.ToUpper()}
+ .MMm `NMMMMMMMMMMMMMMMMMMMMMo    `NMMMMMMd .MMN        Users:          {Users.Count()} found.
+  hMM+ +MMMMMMmsdNMMMMMMMMMMN/    -MMMMMMN- yMM+        
+  `NMN- oMMMMMd   `-/+osso+-     .mMMMMMN: +MMd   
+   -NMN: /NMMMm`               :yMMMMMMm- oMMd`   
+    -mMMs``sMMMMNdhso++///+oydNMMMMMMNo .hMMh`    
+     `yMMm/ .omMMMMMMMMMMMMMMMMMMMMd+``oNMNo      
+       -hMMNo. -ohNMMMMMMMMMMMMmy+. -yNMNy`       
+         .sNMMms/. `-/+++++/:-` ./yNMMmo`         
+            :sdMMMNdyso+++ooshdNMMMdo-            
+               `:+yhmNNMMMMNNdhs+-                
+                       ````                       ");
 
             if (CurrentSave.Users.Count == 0)
             {
-- 
cgit v1.2.3