Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

4 files changed, 4 insertions, 3 deletions

diff --git a/ShiftOS.Server/LegionManager.cs b/ShiftOS.Server/LegionManager.cs
index c4889af..ee2cb76 100644
--- a/ShiftOS.Server/LegionManager.cs
+++ b/ShiftOS.Server/LegionManager.cs
@@ -145,7 +145,7 @@ namespace ShiftOS.Server
                 }
             }
 
-            server.DispatchTo(new Guid(guid), new NetObject("fuck", new ServerMessage
+            server.DispatchTo(new Guid(guid), new NetObject("Sandwich", new ServerMessage //I don't like sandwiches. Have you ever seen me with a sandwich? Why would you think I'd want a sandwich?
             {
                 Name = "user_not_found_in_legion",
                 GUID = "server"
diff --git a/ShiftOS.WinForms/Applications/Artpad.cs b/ShiftOS.WinForms/Applications/Artpad.cs
index c3b717b..6c1bc1c 100644
--- a/ShiftOS.WinForms/Applications/Artpad.cs
+++ b/ShiftOS.WinForms/Applications/Artpad.cs
@@ -1686,7 +1686,7 @@ namespace ShiftOS.WinForms.Applications
             {
                 case "Bold":
                     drawtextfontstyle = FontStyle.Bold;
-                    break;
+                    break; //BREAK COME ON HOO OH YEAHE CHECK IT OUT OH YEAH LETS GO SCRUATCHO HEY
                 case "Italic":
                     drawtextfontstyle = FontStyle.Italic;
                     break;
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index f7153a1..af1e156 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -42,6 +42,7 @@ namespace ShiftOS.WinForms.Applications
     [DefaultIcon("iconPong")]
     public partial class Pong : UserControl, IShiftOSWindow
     {
+        //I can assure you guaranteed that there is an acorn somewhere, in this place, and the sailors are looking for it
         int xVel = 7;
         int yVel = 8;
         int computerspeed = 8;
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 488d843..3952995 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -242,7 +242,7 @@ namespace ShiftOS.Engine
     public static class ShiftOSDevCommands
     {
         [Command("rock", description = "A little surprise for unstable builds...")]
-        public static bool ThrowAFuckingRock()
+        public static bool ThrowASandwichingRock()
         {
             Infobox.Show("He who lives in a glass house shouldn't throw stones...", new Rock().Message);
             return false;