Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00
parent e6aaad1921 a98178251d
commit 408182758f
284 changed files with 5080 additions and 1897 deletions
@@ -108,7 +108,7 @@
 	var/needs_update = 0 // Checks if the icon needs updating so we don't redraw empty trays every time

 	if(myseed && (myseed.loc != src))
-		myseed.loc = src
+		myseed.forceMove(src)

 	if(self_sustaining)
 		adjustNutri(1)