Nothing to see here.
Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/atoms_movable.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/nano/nanomapgen.dm
Get rid of burning and burn_point since they're now redundant.
More burnable shit

Conflicts:
	code/game/turfs/simulated/floor_types.dm
Fire now affects the turf.
Firelock rebalance, see changelog.

Conflicts:
	code/game/machinery/doors/firedoor.dm
	html/changelog.html
Compile fix
Merge pull request #314 from ZomgPonies/master

Patch