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

This commit is contained in:
lempamo 2017-02-25 15:19:16 -05:00
commit 4c1824635b
4 changed files with 4 additions and 3 deletions

View file

@ -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"

View file

@ -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;

View file

@ -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;

View file

@ -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;