From c3bcd3ccd8fb2ad5b1e74431d7cc686cfc9666c9 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 15 Dec 2017 10:01:29 -0500
Subject: [PATCH 1/4] Change some wording to be less SS13 specific

---
 TGS.Server/Instance/Compiler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TGS.Server/Instance/Compiler.cs b/TGS.Server/Instance/Compiler.cs
index 5537794f55..33a9c370c1 100644
--- a/TGS.Server/Instance/Compiler.cs
+++ b/TGS.Server/Instance/Compiler.cs
@@ -517,7 +517,7 @@ namespace TGS.Server
 							return;
 						}
 						UpdateLiveSha(CurrentSha);
-						var msg = String.Format("Compile complete!{0}", !staged ? "" : " Server will update next round.");
+						var msg = String.Format("Compile complete!{0}", !staged ? "" : " Server will update on reboot.");
 						WorldAnnounce("Server updated, changes will be applied on reboot...");
 						SendMessage("DM: " + msg, MessageType.DeveloperInfo);
 						WriteInfo(msg, EventID.DMCompileSuccess);

From 2f91b0856294cad1f6784db6592470d748a84ff6 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 16 Dec 2017 11:53:41 -0500
Subject: [PATCH 2/4] Increases topic recieve timeout to 10s

---
 TGS.Server/Instance/Interop.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TGS.Server/Instance/Interop.cs b/TGS.Server/Instance/Interop.cs
index f24f3101f1..6935a842bb 100644
--- a/TGS.Server/Instance/Interop.cs
+++ b/TGS.Server/Instance/Interop.cs
@@ -211,7 +211,7 @@ namespace TGS.Server
 
 				var returnedString = "NULL";
 				var returnedData = new byte[UInt16.MaxValue];
-				using (var topicSender = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { SendTimeout = 5000, ReceiveTimeout = 5000 })
+				using (var topicSender = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { SendTimeout = 5000, ReceiveTimeout = 10000 })
 					try
 					{
 						topicSender.Connect(IPAddress.Loopback, port);

From 62b3dfd773f05c613b93a2aed20882b2dc04cc39 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 16 Dec 2017 11:58:24 -0500
Subject: [PATCH 3/4] Fixes MergePullRequest with git:// protocol remote

---
 TGS.Server/Instance/Repository.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TGS.Server/Instance/Repository.cs b/TGS.Server/Instance/Repository.cs
index 2f68fa31eb..c9fdcbea4d 100644
--- a/TGS.Server/Instance/Repository.cs
+++ b/TGS.Server/Instance/Repository.cs
@@ -1012,6 +1012,7 @@ namespace TGS.Server
 							var prAPI = remoteUrl;
 							prAPI = prAPI.Replace("/.git", "");
 							prAPI = prAPI.Replace(".git", "");
+							prAPI = prAPI.Replace("git:", "https:");
 							prAPI = prAPI.Replace("github.com", "api.github.com/repos");
 							prAPI += "/pulls/" + PRNumberString + ".json";
 							string json;

From f9f40a089e7bd898026ab3cddb3abea74a032b2a Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 15 Dec 2017 15:00:39 -0500
Subject: [PATCH 4/4] Fix appveyor test logging

---
 Tools/BuildDox.ps1 | 2 +-
 appveyor.yml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tools/BuildDox.ps1 b/Tools/BuildDox.ps1
index 7b1ba9cd9a..3b7d97b684 100644
--- a/Tools/BuildDox.ps1
+++ b/Tools/BuildDox.ps1
@@ -11,7 +11,7 @@ if($publish_dox){
 	echo "Cloning https://git@$github_url..."
 	git clone -b gh-pages --single-branch "https://git@$github_url" "$doxdir" 2>$null
 	rm -r "$doxdir\*"
-	Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico`nHAVE_DOT=YES"
+	Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico"
 }else{
 	Add-Content "$bf\Tools\Doxyfile" "`nPROJECT_NUMBER = $version`nINPUT = $bf`nOUTPUT_DIRECTORY = $doxdir`nPROJECT_LOGO = $bf/tgs.ico"
 }
diff --git a/appveyor.yml b/appveyor.yml
index 6498bb5ce6..3d48f92a14 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
   snk_passphrase:
     secure: dsRGlNewYn/JoycPaMoxLCrb3wkL31RsdU7Xwbo7TIAmClwShCVWeRPN+eGA+fMZX12MDNRBs8Fws4IxqLKQ36thQo6p2B+kPksAUJiAOR5QKJoT6nt8JB1wBMFS2kH4
 skip_branch_with_pr: true
-image: Visual Studio 2017
+image: Previous Visual Studio 2017
 configuration: Release
 shallow_clone: true
 artifacts:
@@ -27,7 +27,7 @@ cache:
   - C:\ProgramData\chocolatey\bin -> appveyor.yml
   - C:\ProgramData\chocolatey\lib -> appveyor.yml
 install:
-  - choco install fciv doxygen.portable graphviz.portable codecov
+  - choco install fciv doxygen.portable codecov
 before_build:
   - nuget restore TGStationServer3.sln
 build: