Merge branch 'master' into upstream-merge-29747

2017-08-20 09:53:17 -05:00
parent 940f5da5fd 5ddf45ca5d
commit ae9e4495f9
352 changed files with 5544 additions and 2715 deletions
@@ -145,7 +145,7 @@

 			var/reason = ""
 			if(requestonly)
-				reason = input("Reason:", name, "") as text|null
+				reason = stripped_input("Reason:", name, "")
 				if(isnull(reason) || ..())
 					return

@@ -0,0 +1,10 @@
+diff a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm	(rejected hunks)
+@@ -145,7 +145,7 @@
+ 
+ 			var/reason = ""
+ 			if(requestonly)
+-				reason = stripped_input("Reason:", name, "") as text|null
+				reason = stripped_input("Reason:", name, "")
+ 				if(isnull(reason) || ..())
+ 					return
+