Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268

2017-05-21 00:44:08 -05:00
parent 94b7e560ab 9785b94cc5
commit 186ed2acbb
149 changed files with 5040 additions and 2255 deletions
@@ -125,7 +125,7 @@ SUBSYSTEM_DEF(vote)
 				log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
 			if("gamemode")
 				if(GLOB.master_mode != .)
-					world.save_mode(.)
+					SSticker.save_mode(.)
 					if(SSticker.HasRoundStarted())
 						restart = 1
 					else