Merge branch 'master' into upstream-merge-37486

2018-05-21 08:59:32 -05:00
parent 50f8779fc0 6060df5b92
commit 931a950adb
403 changed files with 10034 additions and 7488 deletions
@@ -49,7 +49,6 @@
 			on = FALSE
 			to_chat(user, "<span class='warning'>You need a free hand to hold the mister!</span>")
 			return
-		noz.forceMove(user)
 	else
 		//Remove from their hands and put back "into" the tank
 		remove_noz()