moved some condition handling code to its rightful place within the ConditionHandler class
where a machine has a timer trigger, check if that has fired before checking the subcondition