Merge pull request #5358 from Citadel-Station-13/upstream-merge-35395

[MIRROR] Fixes callbacks and invoke time args failing when pushUsr was used
2018-02-07 19:12:35 +00:00
parent a3f3e50f0a 354ed583f2
commit b8f9807e39
2 changed files with 13 additions and 6 deletions
@@ -78,11 +78,13 @@
 		if(W)
 			var/mob/M = W.resolve()
 			if(M)
+				if (length(args))
+					return world.PushUsr(arglist(list(M, src) + args))
 				return world.PushUsr(M, src)
-		
+
 	if (!object)
 		return
-		
+
 	var/list/calling_arguments = arguments
 	if (length(args))
 		if (length(arguments))
@@ -104,11 +106,13 @@
 		if(W)
 			var/mob/M = W.resolve()
 			if(M)
+				if (length(args))
+					return world.PushUsr(arglist(list(M, src) + args))
 				return world.PushUsr(M, src)
-	
+
 	if (!object)
 		return
-		
+
 	var/list/calling_arguments = arguments
 	if (length(args))
 		if (length(arguments))