This commit is contained in:
carverh 2016-07-21 10:06:54 -07:00
parent b50dcf3d31
commit 81a2cdc582
4 changed files with 3351 additions and 3337 deletions

View file

@ -858,7 +858,7 @@ public void DoCommand()
WriteLine("make: Invalid arguments."); WriteLine("make: Invalid arguments.");
} }
break; break;
case "linux": case "devupg":
if (API.DeveloperMode) if (API.DeveloperMode)
{ {
WriteLine("Upgrading your system..."); WriteLine("Upgrading your system...");
@ -1014,6 +1014,7 @@ public void DoCommand()
{ {
ShiftOS.Hacking.AddCharacter(new Character("Philip Adams", "Hello, and welcome to another episode of OSFirstTimer.", 100, 100, 0)); ShiftOS.Hacking.AddCharacter(new Character("Philip Adams", "Hello, and welcome to another episode of OSFirstTimer.", 100, 100, 0));
WriteLine("Philip Adams is now in the list of hirable hackers."); WriteLine("Philip Adams is now in the list of hirable hackers.");
WriteLine("\" I Don't Think This is Canon \" -Carver");
} }
else else
{ {
@ -1478,6 +1479,12 @@ public void DoCommand()
case "syncsave": case "syncsave":
WriteLine("Command removed."); WriteLine("Command removed.");
break; break;
case "year":
WriteLine("Year: 2002"); // Histacom Reference
break;
case "timedistorter":
WriteLine("Install 'timedistorter' by going to shiftnet://12padams"); // Histacom Reference
break;
default: default:
if (API.OpenProgram(args[0]) == false) if (API.OpenProgram(args[0]) == false)
@ -1576,6 +1583,7 @@ private void StartChoice1EndStory()
break; break;
case 8: case 8:
WriteLine("???: You want proof? - holochat_cmd: ERROR: Remote host closed connection."); WriteLine("???: You want proof? - holochat_cmd: ERROR: Remote host closed connection.");
WriteLine("But if he is an AI, who created him?");
break; break;
case 9: case 9:
WriteLine("spkg: Rebooting system in 8 seconds."); WriteLine("spkg: Rebooting system in 8 seconds.");
@ -1600,7 +1608,7 @@ public void StartReboot()
var t1 = new Thread(new ThreadStart(new Action(() => var t1 = new Thread(new ThreadStart(new Action(() =>
{ {
Thread.Sleep(500); Thread.Sleep(500);
WriteLine("ShiftOS: Kernel deactivated."); WriteLine("shift-init: Disconnecting From System Bus...");
Thread.Sleep(1000); Thread.Sleep(1000);
this.Invoke(new Action(() => this.Invoke(new Action(() =>
{ {

View file

@ -8,6 +8,12 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
/*
* WARNING: SOME PARTS OF THIS FILE ARE NSFW
* AS WITH REAL LIFE, VIRUSES ARE NAMED VULGAR THINGS THAT MAY BE NOT APPROPIATE FOR WORK, SCHOOL OR GRANDMOTHER'S BIRTHDAY
* JUST DON'T USE THE WORK OR SCHOOL COMPUTERS TO EDIT THIS FILE, THANK YOU
*/
namespace ShiftOS namespace ShiftOS
{ {
class Viruses class Viruses

View file

@ -376,7 +376,8 @@ internal static string Choice1 {
/// "You may realize that ShiftOS is quite locked down. This is to prevent anything bad from happening.":"???", /// "You may realize that ShiftOS is quite locked down. This is to prevent anything bad from happening.":"???",
/// "However, in your Terminal, you should be able to run 'quests' to view all the tasks we need to accomplish.":"???", /// "However, in your Terminal, you should be able to run 'quests' to view all the tasks we need to accomplish.":"???",
/// "You'll also see a window near the App Launcher, I will use it to talk to you as we do things.":"???", /// "You'll also see a window near the App Launcher, I will use it to talk to you as we do things.":"???",
/// "Well. Let's get started.":"???" /// [rest of string was truncated]";. /// "Well. Let's get started.":"???"
/// [rest of string was truncated]";.
/// </summary> /// </summary>
internal static string Choice2 { internal static string Choice2 {
get { get {

View file

@ -1,9 +1,13 @@
ShiftOS #VER# ShiftOS #VER#
== Developers == == Developers ==
Philip Adams
Michael VanOverbeek Michael VanOverbeek
Carver (www.harri.cf) Philip Adams
GabrielTK
PCSource
The Gitter Badger
Carver Harrison
== External Libraries / Dependencies == == External Libraries / Dependencies ==
@ -24,8 +28,6 @@ Carver (www.harri.cf)
and various other amazing .NET libraries and various other amazing .NET libraries
== Music == == Music ==
All music in ShiftOS is provided by Free Songs to Use, whose YouTube channel can be found at https://www.youtube.com/channel/UCPSX-g40Ti1c5C7sbGNtGzA All music in ShiftOS is provided by Free Songs to Use, whose YouTube channel can be found at https://www.youtube.com/channel/UCPSX-g40Ti1c5C7sbGNtGzA
@ -43,48 +45,47 @@ SUPPORT THESE BRILLIANT ARTISTS!
• Support Miza: • Support Miza:
https://soundcloud.com/miza-official1 https://soundcloud.com/miza-official1
https://soundcloud.com/miza-official1 https://facebook.com/miza.official.page
https://www.facebook.com/miza.official.page
Support Lastep: Support Lastep:
https://www.youtube.com/channel/UCQoGdkBRqzjx12htDBhiCxQ https://youtube.com/channel/UCQoGdkBRqzjx12htDBhiCxQ
https://soundcloud.com/lastepmusic https://soundcloud.com/lastepmusic
https://twitter.com/LastepMusic https://twitter.com/LastepMusic
Support Tom Vanko: Support Tom Vanko:
https://soundcloud.com/tomvanko https://soundcloud.com/tomvanko
https://www.facebook.com/tomvankomusic https://facebook.com/tomvankomusic
https://twitter.com/tomvankomusic https://twitter.com/tomvankomusic
Support Timmo Hendriks: Support Timmo Hendriks:
https://soundcloud.com/dj-timmo https://soundcloud.com/dj-timmo
https://www.facebook.com/TimmoHendriksofficial https://facebook.com/TimmoHendriksofficial
https://twitter.com/Timmo_Hendriks https://twitter.com/Timmo_Hendriks
https://www.instagram.com/timmohendriks/ https://instagram.com/timmohendriks/
https://www.youtube.com/c/TimmoHendriks https://youtube.com/c/TimmoHendriks
Snapchat: Timmo_Hendriks Snapchat: Timmo_Hendriks
Support Mark Vank: Support Mark Vank:
https://soundcloud.com/markvank https://soundcloud.com/markvank
https://www.youtube.com/channel/UCb4ch0_TAKSDvq89NUIElLA https://youtube.com/channel/UCb4ch0_TAKSDvq89NUIElLA
https://twitter.com/MarkVank_ https://twitter.com/MarkVank_
https://www.facebook.com/HardMixOfficial https://facebook.com/HardMixOfficial
Support HardMix: Support HardMix:
https://soundcloud.com/hardmix-ap3x https://soundcloud.com/hardmix-ap3x
http://www.instagram.com/mebn2 http://instagram.com/mebn2
http://www.youtube.com/VoltiDubstep http://youtube.com/VoltiDubstep
Support Eric Rodriguez: Support Eric Rodriguez:
https://soundcloud.com/ericrodriguezofficial https://soundcloud.com/ericrodriguezofficial
https://instagram.com/ericrodriguezmusic/ https://instagram.com/ericrodriguezmusic/
https://www.youtube.com/user/ericrodriguezmusic https://youtube.com/user/ericrodriguezmusic
Go check out Free Songs To Use (and thank them for this brilliant music) Go check out Free Songs To Use (and thank them for this brilliant music)
Facebook: https://www.facebook.com/FreeSongsToUse Facebook: https://facebook.com/FreeSongsToUse
Twitter: https://twitter.com/FreeSongsToUse Twitter: https://twitter.com/FreeSongsToUse
Soundcloud: https://soundcloud.com/FreeSongsToUse Soundcloud: https://soundcloud.com/FreeSongsToUse
Instagram: https://www.instagram.com/freesongstouse_official Instagram: https://instagram.com/freesongstouse_official
== More of Michael's things == == More of Michael's things ==
@ -92,6 +93,9 @@ Instagram: https://www.instagram.com/freesongstouse_official
Enjoyed ShiftOS? Want to see more games and projects from Michael? Why not visit his website at http://michael.playshiftos.ml? Enjoyed ShiftOS? Want to see more games and projects from Michael? Why not visit his website at http://michael.playshiftos.ml?
== More of Carver's things ==
The More Bug Testing the Better. Check Me Out at http://www.harri.cf.
== Special Thanks == == Special Thanks ==
@ -102,13 +106,8 @@ On behalf of the ShiftOS development team, we would love to thank the following
- Philip Adams, a.k.a OSFirstTimer - Philip Adams, a.k.a OSFirstTimer
- All the amazing people on the ShiftOS Forums - All the amazing people on the ShiftOS Forums
Without your help, ShiftOS just wouldn't be what it is today. It probably wouldn't exist if it weren't for OSFirstTimer, and without BizSpark and Azure hosting our website and servers, you wouldn't be able to hear the amazing music you hear right now. That, and without the amazing people at the ShiftOS community bringing us new ideas, suggestions, bug reports, and being generally nice people, the project wouldn't get as far as it has. Without your help, ShiftOS just wouldn't be what it is today.
It probably wouldn't exist if it weren't for OSFirstTimer, and without BizSpark and Azure hosting our website and servers, you wouldn't be able to hear the amazing music you hear right now.
That, and without the amazing people at the ShiftOS community bringing us new ideas, suggestions, bug reports, and being generally nice people, the project wouldn't get as far as it has.
And finally, we want to thank you, #USER#, for giving our game a try. We hope you enjoyed and continue to enjoy it! And finally, we want to thank you, #USER#, for giving our game a try. We hope you enjoyed and continue to enjoy it!