Merge pull request #483 from Citadel-Station-13/upstream-merge-26356

[MIRROR] Fixes action transfer
2017-04-19 18:32:08 -05:00
parent 97e6297a00 02b1e41ec3
commit 367c2cf5eb
1 changed files with 1 additions and 0 deletions
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -40,6 +40,7 @@
 		if(owner)
 			if(owner == M)
 				return
+			Remove(owner)
 		owner = M
 		M.actions += src
 		if(M.client)