Merge pull request #2365 from Citadel-Station-13/upstream-merge-29886

[MIRROR] Fix compile warning
2017-08-14 19:41:03 -05:00
parent 88e9937425 f2c011a37b
commit bda5e94afc
2 changed files with 11 additions and 1 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
+